X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=dpvsimpledecode.h;h=0125d301413284bc3233d877ebf0d35ce76ba3cd;hp=36e61a41724453ec58b6db42e54e1b28fa6fa2d7;hb=ca767b6a14085cfd278eaf6999c0177f75bf19fa;hpb=b0671fcac8564a24ec6d499c0a574d71d937ea7d

diff --git a/dpvsimpledecode.h b/dpvsimpledecode.h
index 36e61a41..0125d301 100644
--- a/dpvsimpledecode.h
+++ b/dpvsimpledecode.h
@@ -1,7 +1,32 @@
+/*
+Copyright (C) 2002-2012 DarkPlaces contributors
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
 
 #ifndef DPVSIMPLEDECODE_H
 #define DPVSIMPLEDECODE_H
 
+#include "qtypes.h"
+#include "qdefs.h"
+#include "cvar.h"
+#include "cl_video.h"
+#include "draw.h"
+
 #define DPVSIMPLEDECODEERROR_NONE 0
 #define DPVSIMPLEDECODEERROR_EOF 1
 #define DPVSIMPLEDECODEERROR_READERROR 2
@@ -16,7 +41,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 +52,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 +60,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