diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-05 01:14:14 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-05 01:14:14 +0000 |
commit | a04e780da0f4b5ffcdbde08da982bbcc753effa7 (patch) | |
tree | f18a33384cee48364b05b2b52b4f626bbda533c7 /Gui/mplayer/gtk | |
parent | 8d45b64a65479b74945b1770bd64e37dd0c7196a (diff) | |
download | mpv-a04e780da0f4b5ffcdbde08da982bbcc753effa7.tar.bz2 mpv-a04e780da0f4b5ffcdbde08da982bbcc753effa7.tar.xz |
- fix equ handling
- fix dvd pos bar
- fix 10l bug in evLoadPlay bugfix :)
- mittomen
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6913 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/mplayer/gtk')
-rw-r--r-- | Gui/mplayer/gtk/eq.c | 4 | ||||
-rw-r--r-- | Gui/mplayer/gtk/fs.c | 2 | ||||
-rw-r--r-- | Gui/mplayer/gtk/opts.c | 12 |
3 files changed, 4 insertions, 14 deletions
diff --git a/Gui/mplayer/gtk/eq.c b/Gui/mplayer/gtk/eq.c index 3b3d1775e4..b87cb2aba8 100644 --- a/Gui/mplayer/gtk/eq.c +++ b/Gui/mplayer/gtk/eq.c @@ -116,7 +116,7 @@ void ShowEqualizer( void ) VHueadj->value=(float)vo_gamma_hue; VSaturationadj->value=(float)vo_gamma_saturation; - if ( !guiIntfStruct.Playing || !gtkEnableVideoEqualizer ) + if ( !guiIntfStruct.Playing ) { gtk_widget_set_sensitive( VContrast,FALSE ); gtk_widget_set_sensitive( VBrightness,FALSE ); @@ -210,7 +210,7 @@ static void eqButtonReleased( GtkButton * button,gpointer user_data ) } else { - if ( !guiIntfStruct.Playing || !gtkEnableVideoEqualizer ) break; + if ( !guiIntfStruct.Playing ) break; gtkSet( gtkSetContrast,0.0f,NULL ); gtkSet( gtkSetBrightness,0.0f,NULL ); gtkSet( gtkSetHue,0.0f,NULL ); diff --git a/Gui/mplayer/gtk/fs.c b/Gui/mplayer/gtk/fs.c index d57b8f18c0..424e2313dc 100644 --- a/Gui/mplayer/gtk/fs.c +++ b/Gui/mplayer/gtk/fs.c @@ -455,7 +455,7 @@ void fs_Ok_released( GtkButton * button,gpointer user_data ) item=item->next; } if ( i ) fsTopList_items=g_list_prepend( fsTopList_items,(gchar *)get_current_dir_name() ); - if ( mplMainAutoPlay ) mplEventHandling( evPlay,0 ); + if ( mplMainAutoPlay ) { mplMainAutoPlay=0; mplEventHandling( evPlay,0 ); } } void fs_Cancel_released( GtkButton * button,gpointer user_data ) diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c index 63c4f6f698..33549c066d 100644 --- a/Gui/mplayer/gtk/opts.c +++ b/Gui/mplayer/gtk/opts.c @@ -35,7 +35,6 @@ static GtkWidget * EVFM; static GtkWidget * CBVFM; static GtkWidget * CBAudioEqualizer; -static GtkWidget * CBVideoEqualizer; //static GtkWidget * CBSurround; static GtkWidget * CBExtraStereo; static GtkWidget * CBNoSound; @@ -122,7 +121,7 @@ void ShowPreferences( void ) { const ao_info_t *info = audio_out_drivers[i++]->info; if ( !strcmp( info->short_name,"plugin" ) ) continue; - if ( !strcmp( gtkAODriver,info->short_name ) ) old_audio_driver=i - 1; + if ( !gstrcmp( gtkAODriver,info->short_name ) ) old_audio_driver=i - 1; tmp[0]=(char *)info->short_name; tmp[1]=(char *)info->name; gtk_clist_append( GTK_CLIST( CLADrivers ),tmp ); } gtk_clist_select_row( GTK_CLIST( CLADrivers ),old_audio_driver,0 ); @@ -132,7 +131,6 @@ void ShowPreferences( void ) } // -- 2. page - gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBVideoEqualizer ),gtkEnableVideoEqualizer ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDoubleBuffer ),gtkVODoubleBuffer ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDR ),gtkVODirectRendering ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBFramedrop ),gtkVFrameDrop ); @@ -282,7 +280,6 @@ void prButton( GtkButton * button,gpointer user_data ) gtkVODriver=gstrdup( vo_driver[0] ); // -- 2. page - gtkEnableVideoEqualizer=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBVideoEqualizer ) ); gtkVODoubleBuffer=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDoubleBuffer ) ); gtkVODirectRendering=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDR ) ); gtkVFrameDrop=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBFramedrop ) ); @@ -822,13 +819,6 @@ GtkWidget * create_Preferences( void ) gtk_container_add( GTK_CONTAINER( frame ),vbox5 ); gtk_widget_set_usize( vbox5,250,-2 ); - CBVideoEqualizer=gtk_check_button_new_with_label( MSGTR_PREFERENCES_VideoEqu ); - gtk_widget_set_name( CBVideoEqualizer,"CBVideoEqualizer" ); - gtk_widget_ref( CBVideoEqualizer ); - gtk_object_set_data_full( GTK_OBJECT( Preferences ),"CBVideoEqualizer",CBVideoEqualizer,(GtkDestroyNotify)gtk_widget_unref ); - gtk_widget_show( CBVideoEqualizer ); - gtk_box_pack_start( GTK_BOX( vbox5 ),CBVideoEqualizer,FALSE,FALSE,0 ); - CBDoubleBuffer=gtk_check_button_new_with_label( MSGTR_PREFERENCES_DoubleBuffer ); gtk_widget_set_name( CBDoubleBuffer,"CBDoubleBuffer" ); gtk_widget_ref( CBDoubleBuffer ); |