Mercurial > mplayer.hg

diff gui/ui/main.c @ 34399:f2c03009068d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't explicitly set stream type if the type doesn't change. Use a self-explanatory symbolic constant which makes the code more easily understandable.
author ib
date Mon, 02 Jan 2012 15:16:55 +0000
parents 0ba85cad4c7e
children ec0ebcb1bd30
line wrap: on
line diff
--- a/gui/ui/main.c	Mon Jan 02 12:53:20 2012 +0000
+++ b/gui/ui/main.c	Mon Jan 02 15:16:55 2012 +0000
@@ -198,7 +198,7 @@
 	 {
 	  plItem * next = listSet( gtkGetCurrPlItem,NULL );
 	  plLastPlayed=next;
-	  uiSetFileName( next->path,next->name,STREAMTYPE_FILE );
+	  uiSetFileName( next->path,next->name,SAME_STREAMTYPE );
 	 }
 
         switch ( guiInfo.StreamType )
@@ -214,7 +214,7 @@
           case STREAMTYPE_CDDA:
 	       guiInfoMediumClear( CLEAR_ALL - CLEAR_VCD - CLEAR_FILE );
 	       if ( !cdrom_device ) cdrom_device=gstrdup( DEFAULT_CDROM_DEVICE );
-	       uiSetFileName( NULL,cdrom_device,STREAMTYPE_CDDA );
+	       uiSetFileName( NULL,cdrom_device,SAME_STREAMTYPE );
 	       if ( guiInfo.Playing != GUI_PAUSE )
 	        {
 		 if ( !guiInfo.Track )
@@ -227,7 +227,7 @@
           case STREAMTYPE_VCD:
 	       guiInfoMediumClear( CLEAR_ALL - CLEAR_VCD - CLEAR_FILE );
 	       if ( !cdrom_device ) cdrom_device=gstrdup( DEFAULT_CDROM_DEVICE );
-	       uiSetFileName( NULL,cdrom_device,STREAMTYPE_VCD );
+	       uiSetFileName( NULL,cdrom_device,SAME_STREAMTYPE );
 	       if ( guiInfo.Playing != GUI_PAUSE )
 	        {
 		 if ( !guiInfo.Track )
@@ -240,7 +240,7 @@
           case STREAMTYPE_DVD:
 	       guiInfoMediumClear( CLEAR_ALL - CLEAR_DVD - CLEAR_FILE );
 	       if ( !dvd_device ) dvd_device=gstrdup( DEFAULT_DVD_DEVICE );
-	       uiSetFileName( NULL,dvd_device,STREAMTYPE_DVD );
+	       uiSetFileName( NULL,dvd_device,SAME_STREAMTYPE );
 	       if ( guiInfo.Playing != GUI_PAUSE )
 	        {
                  guiInfo.NewPlay=GUI_FILE_SAME;