diff data/fileio/VideoFileReader.h @ 191:be6d31baecb9

compilation under linux - kunbuntu V7.10 (without video support)

--- a/data/fileio/VideoFileReader.h	Tue Nov 27 13:26:04 2007 +0000
+++ b/data/fileio/VideoFileReader.h	Wed Nov 28 13:03:45 2007 +0000
@@ -10,63 +10,64 @@
 	published by the Free Software Foundation; either version 2 of the
 	License, or (at your option) any later version.  See the file
 	COPYING included with this distribution for more information.
-*/
-
-#ifndef _VIDEO_FILE_READER_H_
-#define _VIDEO_FILE_READER_H_
-
-#ifdef HAVE_FFMPEG
+*/
+
+#ifndef _VIDEO_FILE_READER_H_
+#define _VIDEO_FILE_READER_H_
+
+#include <set>
+
+#ifdef HAVE_FFMPEG
 #ifdef __cplusplus
 extern "C" {
-#endif
-#include "SDL_ffmpeg.h"
-
+#endif /*__cplusplus*/
+#include "videoio/SDL_ffmpeg.h"
+
 #ifdef __cplusplus
 }
-#endif
-#include "../../sv/main/MainWindow.h"
-#include "CodedAudioFileReader.h"
-//#include "base/AudioCallbackPlaySource.h"
-
-
-#include <set>
-//class AudioCallbackPlaySource;
-class QProgressDialog;
-
-class VideoFileReader : public CodedAudioFileReader
-{
-public:
-    VideoFileReader(QString path, bool showProgress, CacheMode cacheMode);
-    virtual ~VideoFileReader();
-
-    virtual QString getError() const { return m_error; }
-
-    static void getSupportedExtensions(std::set<QString> &extensions);
-	void VideoFileReader::processEvents();
-    
-protected:
-    QString m_path;
-    QString m_error;
-    size_t m_fileSize;
-    double m_bitrateNum;
-    size_t m_bitrateDenom;
-	SDL_Surface *screen;
-	SDL_ffmpegFile* film;
-    QProgressDialog *m_progress;
+#endif /*__cplusplus*/
+
+#include "../../sv/main/MainWindow.h"
+#include "CodedAudioFileReader.h"
+//#include "base/AudioCallbackPlaySource.h"
+
+//class AudioCallbackPlaySource;
+class QProgressDialog;
+
+class VideoFileReader : public CodedAudioFileReader
+{
+public:
+    VideoFileReader(QString path, bool showProgress, CacheMode cacheMode);
+    virtual ~VideoFileReader();
+
+    virtual QString getError() const { return m_error; }
+
+    static void getSupportedExtensions(std::set<QString> &extensions);
+    void processEvents();
+    
+protected:
+    QString m_path;
+    QString m_error;
+    size_t m_fileSize;
+    double m_bitrateNum;
+    size_t m_bitrateDenom;
+	SDL_Surface *screen;
+	SDL_ffmpegFile* film;
+    QProgressDialog *m_progress;
     bool m_cancelled;
 	int m_width;
 	int m_height;
 	float m_zoomfactor;
 	
 	
-
-   
-    bool decodeAudio(SDL_ffmpegFile* file);
-	bool videoInit(SDL_ffmpegFile* file);
-	int videoPlay(); 
-	static int videoPlayCall(void*);
-};
-
-#endif
-
-#endif
\ No newline at end of file
+
+   
+    bool decodeAudio(SDL_ffmpegFile* file);
+	bool videoInit(SDL_ffmpegFile* file);
+	int videoPlay(); 
+	static int videoPlayCall(void*);
+};
+
+#endif /*HAVE_FFMPEG*/
+
+#endif /*_VIDEO_FILE_READER_H_*/
\ No newline at end of file