comparison data/fileio/VideoFileReader.cpp @ 256:6eeb195adbb4

Video works fine now.
Ivan fixed bugs.

 #include <Windows.h>
 #endif
 long long countFreq;
 int Videow=320;
 int Videoh=240;
-float zoomFivan=1;
+int zoomWivan=320;
+int zoomHivan=240;
+int haveFilm=0;
+
 VideoFileReader::VideoFileReader(QString path, bool showProgress, CacheMode mode) :
     CodedAudioFileReader(mode),
     m_path(path)
 {
     m_frameCount = 0;

         m_error = QString("Failed to open file %1 for reading.").arg(SDL_GetError());
         return;
     }
     m_fileSize = stat.st_size;
 
-    
+    if (haveFilm)  
+	{
+		haveFilm=1;
+		SDL_ffmpegFree(film);
+	}
     // open file from arg[1]
     film = SDL_ffmpegOpen(path.toLocal8Bit().data());
     if (path.endsWith("mpg")) film->delay=1;
 	if (path.endsWith("divx")) film->delay=1;
 	if(!film) 

 
 	//TODO update the size according to the component size
 	// this will not work if video size is bigger than window size.
 	m_width =w;
 	m_height =h;
-
+	zoomWivan =w;
+	zoomHivan =h;
 	MWins->setSDLInitSize(w,h);
     // Open the Video device
     screen = SDL_SetVideoMode(w, h, 0, SDL_DOUBLEBUF|SDL_HWSURFACE|SDL_RESIZABLE|SDL_ASYNCBLIT|SDL_HWACCEL);
 	//SDL_WM_SetCaption("EASAIER Video Player", "EASAIER Video Player");
     if(!screen) {

 				w=80;
 				h=60;
 				m_zoomfactor = 80.0/Videow;
 			}
 			// Open the Video device
-			zoomFivan = m_zoomfactor;
+			//zoomFivan = m_zoomfactor;
 			screen = SDL_SetVideoMode(w, h, 0, SDL_DOUBLEBUF|SDL_HWSURFACE|SDL_RESIZABLE|SDL_ASYNCBLIT|SDL_HWACCEL);
 			MWins->setSDLInitSize(w,h);
 			m_width =w;
 			m_height =h;
+			zoomWivan =w;
+			zoomHivan =h;
 			
 		}
 		// calls process events function, to take in account the user input
 		processEvents();
 		if (MWins->isAudioPlaying())