Mercurial > mplayer.hg
changeset 9812:22092ed814ad
fix dvd, vcd playing, compiling, and add one small playlist patch
| author | pontscho |
|---|---|
| date | Thu, 03 Apr 2003 12:09:44 +0000 |
| parents | 7089c6c95adb |
| children | b0141de527df |
| files | Gui/interface.c Gui/mplayer/gtk/pl.c |
| diffstat | 2 files changed, 15 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Gui/interface.c Thu Apr 03 12:02:28 2003 +0000 +++ b/Gui/interface.c Thu Apr 03 12:09:44 2003 +0000 @@ -366,6 +366,7 @@ extern vo_functions_t * video_out; extern int frame_dropping; extern int stream_dump_type; +extern int vcd_track; extern m_obj_settings_t*vo_plugin_args; #if defined( USE_OSD ) || defined( USE_SUB ) @@ -694,12 +695,20 @@ break; #ifdef HAVE_VCD case STREAMTYPE_VCD: - vcd_track=guiIntfStruct.Track; + { + char tmp[512]; + sprintf( tmp,"vcd://%d",guiIntfStruct.Track + 1 ); + guiSetFilename( guiIntfStruct.Filename,tmp ); + } break; #endif #ifdef USE_DVDREAD case STREAMTYPE_DVD: - dvd_title=guiIntfStruct.Title; + { + char tmp[512]; + sprintf( tmp,"dvd://%d",guiIntfStruct.Title ); + guiSetFilename( guiIntfStruct.Filename,tmp ); + } dvd_chapter=guiIntfStruct.Chapter; dvd_angle=guiIntfStruct.Angle; break;
--- a/Gui/mplayer/gtk/pl.c Thu Apr 03 12:02:28 2003 +0000 +++ b/Gui/mplayer/gtk/pl.c Thu Apr 03 12:09:44 2003 +0000 @@ -234,17 +234,19 @@ break; case 2: // remove { - int i; int c=0; + int i; int j; int c=0; gtk_signal_handler_block( GTK_OBJECT( CLSelected ),sigSel ); gtk_signal_handler_block( GTK_OBJECT( CLSelected ),sigUnsel ); gtk_clist_freeze( GTK_CLIST( CLSelected ) ); - for ( i=0;i<NrOfSelected;i++ ) + for ( i=0;i<NrOfSelected-c;i++ ) if ( CLListSelected[i] ) { gtk_clist_remove( GTK_CLIST( CLSelected ),i - c ); c++; + for ( j=i;j<NrOfSelected-c;j++ ) + CLListSelected[i] = CLListSelected[i+1]; } NrOfSelected-=c; gtk_clist_thaw( GTK_CLIST( CLSelected ) );