[MPlayer-cvslog] r33863 - in trunk/gui: interface.c interface.h win32/dialogs.c win32/interface.c

[ib]

Author: ib
Date: Sun Jul 10 14:01:39 2011
New Revision: 33863

Log:
Remove member FPS from struct guiInterface_t.

Retrieve the information directly using member sh_video.

Modified:
   trunk/gui/interface.c
   trunk/gui/interface.h
   trunk/gui/win32/dialogs.c
   trunk/gui/win32/interface.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Sun Jul 10 13:51:25 2011	(r33862)
+++ trunk/gui/interface.c	Sun Jul 10 14:01:39 2011	(r33863)
@@ -692,11 +692,6 @@ int gui(int what, void *arg)
 
         guiInfo.sh_video = arg;
 
-        if (arg) {
-            sh_video_t *sh = arg;
-            guiInfo.FPS = sh->fps;
-        }
-
         if (guiInfo.StreamType == STREAMTYPE_STREAM)
             btnSet(evSetMoviePosition, btnDisabled);
         else
@@ -1146,7 +1141,7 @@ void mplayerLoadSubtitle(char *name)
     if (name) {
         mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_LoadingSubtitles, name);
 
-        subdata = sub_read_file(name, guiInfo.FPS);
+        subdata = sub_read_file(name, (guiInfo.sh_video ? guiInfo.sh_video->fps : 0));
 
         if (!subdata)
             gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_CantLoadSub, name);

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Sun Jul 10 13:51:25 2011	(r33862)
+++ trunk/gui/interface.h	Sun Jul 10 14:01:39 2011	(r33863)
@@ -126,7 +126,6 @@ typedef struct {
     int StreamType;
     int TimeSec;
     int LengthInSec;
-    float FPS;
 
     char *Filename;
     int FilenameChanged;

Modified: trunk/gui/win32/dialogs.c
==============================================================================
--- trunk/gui/win32/dialogs.c	Sun Jul 10 13:51:25 2011	(r33862)
+++ trunk/gui/win32/dialogs.c	Sun Jul 10 14:01:39 2011	(r33863)
@@ -76,7 +76,7 @@ void mplayerLoadSubtitle(char *name)
     if (name)
     {
         mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_LoadingSubtitles, name);
-        subdata = sub_read_file(strdup(name), guiInfo.FPS);
+        subdata = sub_read_file(strdup(name), (guiInfo.sh_video ? guiInfo.sh_video->fps : 0));
         if (!subdata) mp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_CantLoadSub,name);
         sub_name = (malloc(2 * sizeof(char*))); /* when mplayer will be restarted */
         sub_name[0] = strdup(name);               /* sub_name[0] will be read */

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Sun Jul 10 13:51:25 2011	(r33862)
+++ trunk/gui/win32/interface.c	Sun Jul 10 14:01:39 2011	(r33863)
@@ -562,7 +562,6 @@ int gui(int what, void *arg)
             {
                 sh_video_t *sh = arg;
                 codecname = sh->codec->name;
-                guiInfo.FPS = sh->fps;
 
                 /* we have video, show the subwindow */
                 if(!IsWindowVisible(mygui->subwindow) || IsIconic(mygui->subwindow))