Mercurial > mplayer.hg

diff gui/interface.c @ 33775:b42abb9c7f2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove member FPS from struct guiInterface_t. Retrieve the information directly using member sh_video.
author ib
date Sun, 10 Jul 2011 12:01:39 +0000
parents 474ffcdcc6e7
children ab6d06f5b98b
line wrap: on
line diff
--- a/gui/interface.c	Sun Jul 10 11:51:25 2011 +0000
+++ b/gui/interface.c	Sun Jul 10 12:01:39 2011 +0000
@@ -692,11 +692,6 @@
 
         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 @@
     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);