mirror of
https://github.com/mpv-player/mpv
synced 2024-10-06 14:54:02 +02:00
fix dvd, vcd playing, compiling, and add one small playlist patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9813 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
bf59503b54
commit
6637888c97
@ -366,6 +366,7 @@ extern ao_functions_t * audio_out;
|
|||||||
extern vo_functions_t * video_out;
|
extern vo_functions_t * video_out;
|
||||||
extern int frame_dropping;
|
extern int frame_dropping;
|
||||||
extern int stream_dump_type;
|
extern int stream_dump_type;
|
||||||
|
extern int vcd_track;
|
||||||
extern m_obj_settings_t*vo_plugin_args;
|
extern m_obj_settings_t*vo_plugin_args;
|
||||||
|
|
||||||
#if defined( USE_OSD ) || defined( USE_SUB )
|
#if defined( USE_OSD ) || defined( USE_SUB )
|
||||||
@ -694,12 +695,20 @@ int guiGetEvent( int type,char * arg )
|
|||||||
break;
|
break;
|
||||||
#ifdef HAVE_VCD
|
#ifdef HAVE_VCD
|
||||||
case STREAMTYPE_VCD:
|
case STREAMTYPE_VCD:
|
||||||
vcd_track=guiIntfStruct.Track;
|
{
|
||||||
|
char tmp[512];
|
||||||
|
sprintf( tmp,"vcd://%d",guiIntfStruct.Track + 1 );
|
||||||
|
guiSetFilename( guiIntfStruct.Filename,tmp );
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
#ifdef USE_DVDREAD
|
#ifdef USE_DVDREAD
|
||||||
case STREAMTYPE_DVD:
|
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_chapter=guiIntfStruct.Chapter;
|
||||||
dvd_angle=guiIntfStruct.Angle;
|
dvd_angle=guiIntfStruct.Angle;
|
||||||
break;
|
break;
|
||||||
|
@ -234,17 +234,19 @@ static void plButtonReleased( GtkButton * button,gpointer user_data )
|
|||||||
break;
|
break;
|
||||||
case 2: // remove
|
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 ),sigSel );
|
||||||
gtk_signal_handler_block( GTK_OBJECT( CLSelected ),sigUnsel );
|
gtk_signal_handler_block( GTK_OBJECT( CLSelected ),sigUnsel );
|
||||||
|
|
||||||
gtk_clist_freeze( GTK_CLIST( CLSelected ) );
|
gtk_clist_freeze( GTK_CLIST( CLSelected ) );
|
||||||
for ( i=0;i<NrOfSelected;i++ )
|
for ( i=0;i<NrOfSelected-c;i++ )
|
||||||
if ( CLListSelected[i] )
|
if ( CLListSelected[i] )
|
||||||
{
|
{
|
||||||
gtk_clist_remove( GTK_CLIST( CLSelected ),i - c );
|
gtk_clist_remove( GTK_CLIST( CLSelected ),i - c );
|
||||||
c++;
|
c++;
|
||||||
|
for ( j=i;j<NrOfSelected-c;j++ )
|
||||||
|
CLListSelected[i] = CLListSelected[i+1];
|
||||||
}
|
}
|
||||||
NrOfSelected-=c;
|
NrOfSelected-=c;
|
||||||
gtk_clist_thaw( GTK_CLIST( CLSelected ) );
|
gtk_clist_thaw( GTK_CLIST( CLSelected ) );
|
||||||
|
Loading…
Reference in New Issue
Block a user