Mercurial > mplayer.hg

comparison gui/ui/main.c @ 33897:e0d211c62cf7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetic: Rename some guiInfo members. Rename TimeSec ElapsedTime and LengthInSec RunningTime for clarity. Rename AudioFile AudioFilename and Subtitlename SubtitleFilename for consistency.
author ib
date Fri, 12 Aug 2011 15:25:30 +0000
parents c51e44dd38e2
children 67790ce1185e
comparison
equal deleted inserted replaced
33896:89157330d7da 33897:e0d211c62cf7
106 static void guiInfoMediumClear (int what) 106 static void guiInfoMediumClear (int what)
107 { 107 {
108 if (what & CLEAR_FILE) 108 if (what & CLEAR_FILE)
109 { 109 {
110 nfree(guiInfo.Filename); 110 nfree(guiInfo.Filename);
111 nfree(guiInfo.Subtitlename); 111 nfree(guiInfo.SubtitleFilename);
112 nfree(guiInfo.AudioFile); 112 nfree(guiInfo.AudioFilename);
113 listSet(gtkDelPl, NULL); 113 listSet(gtkDelPl, NULL);
114 } 114 }
115 115
116 #ifdef CONFIG_DVDREAD 116 #ifdef CONFIG_DVDREAD
117 if (what & CLEAR_DVD) 117 if (what & CLEAR_DVD)
141 case evExit: 141 case evExit:
142 mplayer( MPLAYER_EXIT_GUI, EXIT_QUIT, 0 ); 142 mplayer( MPLAYER_EXIT_GUI, EXIT_QUIT, 0 );
143 break; 143 break;
144 144
145 case evPlayNetwork: 145 case evPlayNetwork:
146 nfree( guiInfo.Subtitlename ); 146 nfree( guiInfo.SubtitleFilename );
147 nfree( guiInfo.AudioFile ); 147 nfree( guiInfo.AudioFilename );
148 guiInfo.StreamType=STREAMTYPE_STREAM; 148 guiInfo.StreamType=STREAMTYPE_STREAM;
149 goto play; 149 goto play;
150 case evSetURL: 150 case evSetURL:
151 gtkShow( evPlayNetwork,NULL ); 151 gtkShow( evPlayNetwork,NULL );
152 break; 152 break;
270 listSet( gtkDelPl,NULL ); 270 listSet( gtkDelPl,NULL );
271 gtkShow( evLoad,NULL ); 271 gtkShow( evLoad,NULL );
272 break; 272 break;
273 case evLoadSubtitle: gtkShow( evLoadSubtitle,NULL ); break; 273 case evLoadSubtitle: gtkShow( evLoadSubtitle,NULL ); break;
274 case evDropSubtitle: 274 case evDropSubtitle:
275 nfree( guiInfo.Subtitlename ); 275 nfree( guiInfo.SubtitleFilename );
276 mplayerLoadSubtitle( NULL ); 276 mplayerLoadSubtitle( NULL );
277 break; 277 break;
278 case evLoadAudioFile: gtkShow( evLoadAudioFile,NULL ); break; 278 case evLoadAudioFile: gtkShow( evLoadAudioFile,NULL ); break;
279 case evPrev: uiPrev(); break; 279 case evPrev: uiPrev(); break;
280 case evNext: uiNext(); break; 280 case evNext: uiNext(); break;
658 uiSetFileName( NULL,filename,STREAMTYPE_FILE ); 658 uiSetFileName( NULL,filename,STREAMTYPE_FILE );
659 if ( guiInfo.Playing == GUI_PLAY ) uiEventHandling( evStop,0 ); 659 if ( guiInfo.Playing == GUI_PLAY ) uiEventHandling( evStop,0 );
660 uiEventHandling( evPlay,0 ); 660 uiEventHandling( evPlay,0 );
661 } 661 }
662 if (subtitles) { 662 if (subtitles) {
663 nfree(guiInfo.Subtitlename); 663 nfree(guiInfo.SubtitleFilename);
664 guiInfo.Subtitlename = subtitles; 664 guiInfo.SubtitleFilename = subtitles;
665 mplayerLoadSubtitle(guiInfo.Subtitlename); 665 mplayerLoadSubtitle(guiInfo.SubtitleFilename);
666 } 666 }
667 } 667 }