diff gui/interface.c @ 33894:b2e63fe7fe17

Remove needless guiInfo member FilenameChanged. Use existing member NewPlay for this, because FilenameChanged and NewPlay == GUI_FILE_NEW mean the same.

--- a/gui/interface.c	Fri Aug 12 13:31:44 2011 +0000
+++ b/gui/interface.c	Fri Aug 12 14:09:36 2011 +0000
@@ -382,8 +382,8 @@
 
     case GUI_SET_FILE:
 
-// if ( guiInfo.Playing == 1 && guiInfo.FilenameChanged )
-        if (guiInfo.FilenameChanged) {
+// if ( guiInfo.Playing == 1 && guiInfo.NewPlay == GUI_FILE_NEW )
+        if (guiInfo.NewPlay == GUI_FILE_NEW) {
             audio_id  = -1;
             video_id  = -1;
             dvdsub_id = -1;
@@ -628,12 +628,11 @@
 
         if (guiInfo.AudioFile)
             audio_stream = gstrdup(guiInfo.AudioFile);
-        else if (guiInfo.FilenameChanged)
+        else if (guiInfo.NewPlay == GUI_FILE_NEW)
             nfree(audio_stream);
 
 // audio_stream = NULL;
 
-        guiInfo.FilenameChanged = 0;
         guiInfo.NewPlay = 0;
 
 #ifdef CONFIG_ASS
@@ -788,12 +787,11 @@
             plLastPlayed = next;
             setddup(&guiInfo.Filename, next->path, next->name);
             guiInfo.StreamType      = STREAMTYPE_FILE;
-            guiInfo.FilenameChanged = 1;
             guiInfo.NewPlay = GUI_FILE_NEW;
             nfree(guiInfo.AudioFile);
             nfree(guiInfo.Subtitlename);
         } else {
-            if (guiInfo.FilenameChanged || (guiInfo.NewPlay == GUI_FILE_NEW))
+            if (guiInfo.NewPlay == GUI_FILE_NEW)
                 break;
 
             guiInfo.TimeSec       = 0;