X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=dpvsimpledecode.h;h=0b0ac35a140c8ff4311da8d29fab5c65a0582308;hp=36e61a41724453ec58b6db42e54e1b28fa6fa2d7;hb=19487ef2ebada39fb6a6a372b30ca4f66bb78ada;hpb=b0671fcac8564a24ec6d499c0a574d71d937ea7d

diff --git a/dpvsimpledecode.h b/dpvsimpledecode.h
index 36e61a41..0b0ac35a 100644
--- a/dpvsimpledecode.h
+++ b/dpvsimpledecode.h
@@ -2,6 +2,8 @@
 #ifndef DPVSIMPLEDECODE_H
 #define DPVSIMPLEDECODE_H
 
+#include "cl_video.h"
+
 #define DPVSIMPLEDECODEERROR_NONE 0
 #define DPVSIMPLEDECODEERROR_EOF 1
 #define DPVSIMPLEDECODEERROR_READERROR 2
@@ -16,7 +18,8 @@
 // opening and closing streams
 
 // opens a stream
-void *dpvsimpledecode_open(char *filename, char **errorstring);
+void *dpvsimpledecode_open(clvideo_t *video, char *filename, const char **errorstring);
+
 // closes a stream
 void dpvsimpledecode_close(void *stream);
 
@@ -26,7 +29,7 @@ void dpvsimpledecode_close(void *stream);
 // number to DPVDECODEERROR_NONE
 // if the supplied string pointer variable is not NULL, it will be set to the
 // error message
-int dpvsimpledecode_error(void *stream, char **errorstring);
+int dpvsimpledecode_error(void *stream, const char **errorstring);
 
 // returns the width of the image data
 unsigned int dpvsimpledecode_getwidth(void *stream);
@@ -34,16 +37,13 @@ unsigned int dpvsimpledecode_getwidth(void *stream);
 // returns the height of the image data
 unsigned int dpvsimpledecode_getheight(void *stream);
 
-// returns the sound sample rate of the stream
-unsigned int dpvsimpledecode_getsoundrate(void *stream);
-
 // returns the framerate of the stream
 double dpvsimpledecode_getframerate(void *stream);
 
+// returns aspect ratio of the stream
+double dpvsimpledecode_getaspectratio(void *stream);
+
 // decodes a video frame to the supplied output pixels
 int dpvsimpledecode_video(void *stream, void *imagedata, unsigned int Rmask, unsigned int Gmask, unsigned int Bmask, unsigned int bytesperpixel, int imagebytesperrow);
-// reads some sound
-// (note: sound is 16bit stereo native-endian, left channel first)
-int dpvsimpledecode_audio(void *stream, short *soundbuffer, int requestedlength);
 
 #endif