[MPlayer-cvslog] r33857 - in trunk/gui/ui/gtk: equalizer.c preferences.c
ib
subversion at mplayerhq.hu
Sat Jul 9 12:39:33 CEST 2011
Author: ib
Date: Sat Jul 9 12:39:33 2011
New Revision: 33857
Log:
Cosmetic: Change parameter of mplayer() calls.
For optical reasons, change parameter vparam from NULL to 0
where it isn't used to pass anything.
Modified:
trunk/gui/ui/gtk/equalizer.c
trunk/gui/ui/gtk/preferences.c
Modified: trunk/gui/ui/gtk/equalizer.c
==============================================================================
--- trunk/gui/ui/gtk/equalizer.c Sat Jul 9 12:23:47 2011 (r33856)
+++ trunk/gui/ui/gtk/equalizer.c Sat Jul 9 12:39:33 2011 (r33857)
@@ -212,10 +212,10 @@ static gboolean eqVScaleMotion( GtkWidge
switch( (int)user_data )
{
- case 1: mplayer( MPLAYER_SET_CONTRAST,VContrastadj->value,NULL ); break;
- case 2: mplayer( MPLAYER_SET_BRIGHTNESS,VBrightnessadj->value,NULL ); break;
- case 3: mplayer( MPLAYER_SET_HUE,VHueadj->value,NULL ); break;
- case 4: mplayer( MPLAYER_SET_SATURATION,VSaturationadj->value,NULL ); break;
+ case 1: mplayer( MPLAYER_SET_CONTRAST,VContrastadj->value,0 ); break;
+ case 2: mplayer( MPLAYER_SET_BRIGHTNESS,VBrightnessadj->value,0 ); break;
+ case 3: mplayer( MPLAYER_SET_HUE,VHueadj->value,0 ); break;
+ case 4: mplayer( MPLAYER_SET_SATURATION,VSaturationadj->value,0 ); break;
}
return FALSE;
@@ -236,10 +236,10 @@ static void eqButtonReleased( GtkButton
else
{
if ( !guiInfo.Playing ) break;
- mplayer( MPLAYER_SET_CONTRAST,0,NULL );
- mplayer( MPLAYER_SET_BRIGHTNESS,0,NULL );
- mplayer( MPLAYER_SET_HUE,0,NULL );
- mplayer( MPLAYER_SET_SATURATION,0,NULL );
+ mplayer( MPLAYER_SET_CONTRAST,0,0 );
+ mplayer( MPLAYER_SET_BRIGHTNESS,0,0 );
+ mplayer( MPLAYER_SET_HUE,0,0 );
+ mplayer( MPLAYER_SET_SATURATION,0,0 );
eqSetBands( Channel );
}
break;
Modified: trunk/gui/ui/gtk/preferences.c
==============================================================================
--- trunk/gui/ui/gtk/preferences.c Sat Jul 9 12:23:47 2011 (r33856)
+++ trunk/gui/ui/gtk/preferences.c Sat Jul 9 12:39:33 2011 (r33857)
@@ -545,7 +545,7 @@ static void prButton( GtkButton * button
gtkAOExtraStereo=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBExtraStereo ) );
gtkAONorm=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNormalize ) );
soft_vol=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSoftwareMixer ) );
- mplayer( MPLAYER_SET_EXTRA_STEREO,HSExtraStereoMuladj->value,NULL );
+ mplayer( MPLAYER_SET_EXTRA_STEREO,HSExtraStereoMuladj->value,0 );
audio_delay=HSAudioDelayadj->value;
gaddlist( &audio_driver_list,ao_driver[0] );
@@ -588,16 +588,16 @@ static void prButton( GtkButton * button
// --- 4. page
setdup( &font_name,gtk_entry_get_text( GTK_ENTRY( prEFontName ) ) );
#ifndef CONFIG_FREETYPE
- mplayer( MPLAYER_SET_FONT_FACTOR,HSFontFactoradj->value,NULL );
+ mplayer( MPLAYER_SET_FONT_FACTOR,HSFontFactoradj->value,0 );
#else
- mplayer( MPLAYER_SET_FONT_BLUR,HSFontBluradj->value,NULL );
- mplayer( MPLAYER_SET_FONT_OUTLINE,HSFontOutLineadj->value,NULL );
- mplayer( MPLAYER_SET_FONT_TEXTSCALE,HSFontTextScaleadj->value,NULL );
- mplayer( MPLAYER_SET_FONT_OSDSCALE,HSFontOSDScaleadj->value,NULL );
- if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBFontNoAutoScale ) ) ) mplayer( MPLAYER_SET_FONT_AUTOSCALE,0,NULL );
- if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBFontAutoScaleHeight ) ) ) mplayer( MPLAYER_SET_FONT_AUTOSCALE,1,NULL );
- if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBFontAutoScaleWidth ) ) ) mplayer( MPLAYER_SET_FONT_AUTOSCALE,2,NULL );
- if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBFontAutoScaleDiagonal ) ) ) mplayer( MPLAYER_SET_FONT_AUTOSCALE,3,NULL );
+ mplayer( MPLAYER_SET_FONT_BLUR,HSFontBluradj->value,0 );
+ mplayer( MPLAYER_SET_FONT_OUTLINE,HSFontOutLineadj->value,0 );
+ mplayer( MPLAYER_SET_FONT_TEXTSCALE,HSFontTextScaleadj->value,0 );
+ mplayer( MPLAYER_SET_FONT_OSDSCALE,HSFontOSDScaleadj->value,0 );
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBFontNoAutoScale ) ) ) mplayer( MPLAYER_SET_FONT_AUTOSCALE,0,0 );
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBFontAutoScaleHeight ) ) ) mplayer( MPLAYER_SET_FONT_AUTOSCALE,1,0 );
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBFontAutoScaleWidth ) ) ) mplayer( MPLAYER_SET_FONT_AUTOSCALE,2,0 );
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBFontAutoScaleDiagonal ) ) ) mplayer( MPLAYER_SET_FONT_AUTOSCALE,3,0 );
#endif
// -- 5. page
@@ -629,7 +629,7 @@ static void prButton( GtkButton * button
stop_xscreensaver=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBStopXScreenSaver ) );
gtkEnablePlayBar=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPlayBar ) );
player_idle_mode=!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNoIdle ) );
- mplayer( MPLAYER_SET_AUTO_QUALITY,HSPPQualityadj->value,NULL );
+ mplayer( MPLAYER_SET_AUTO_QUALITY,HSPPQualityadj->value,0 );
if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBCache ) ) ) { gtkCacheSize=(int)SBCacheadj->value; gtkCacheOn=1; }
else gtkCacheOn=0;
@@ -678,13 +678,13 @@ static gboolean prHScaler( GtkWidget * w
{
case 0: // extra stereo coefficient
if ( !guiInfo.Playing ) break;
- mplayer( MPLAYER_SET_EXTRA_STEREO,HSExtraStereoMuladj->value,NULL );
+ mplayer( MPLAYER_SET_EXTRA_STEREO,HSExtraStereoMuladj->value,0 );
break;
case 1: // audio delay
audio_delay=HSAudioDelayadj->value;
break;
case 2: // panscan
- mplayer( MPLAYER_SET_PANSCAN,HSPanscanadj->value,NULL );
+ mplayer( MPLAYER_SET_PANSCAN,HSPanscanadj->value,0 );
break;
case 3: // sub delay
sub_delay=HSSubDelayadj->value;
@@ -694,24 +694,24 @@ static gboolean prHScaler( GtkWidget * w
break;
#ifndef CONFIG_FREETYPE
case 5: // font factor
- mplayer( MPLAYER_SET_FONT_FACTOR,HSFontFactoradj->value,NULL );
+ mplayer( MPLAYER_SET_FONT_FACTOR,HSFontFactoradj->value,0 );
break;
#else
case 6: // font blur
- mplayer( MPLAYER_SET_FONT_BLUR,HSFontBluradj->value,NULL );
+ mplayer( MPLAYER_SET_FONT_BLUR,HSFontBluradj->value,0 );
break;
case 7: // font outline
- mplayer( MPLAYER_SET_FONT_OUTLINE,HSFontOutLineadj->value,NULL );
+ mplayer( MPLAYER_SET_FONT_OUTLINE,HSFontOutLineadj->value,0 );
break;
case 8: // text scale
- mplayer( MPLAYER_SET_FONT_TEXTSCALE,HSFontTextScaleadj->value,NULL );
+ mplayer( MPLAYER_SET_FONT_TEXTSCALE,HSFontTextScaleadj->value,0 );
break;
case 9: // osd scale
- mplayer( MPLAYER_SET_FONT_OSDSCALE,HSFontOSDScaleadj->value,NULL );
+ mplayer( MPLAYER_SET_FONT_OSDSCALE,HSFontOSDScaleadj->value,0 );
break;
#endif
case 10: // auto quality
- mplayer( MPLAYER_SET_AUTO_QUALITY,HSPPQualityadj->value,NULL );
+ mplayer( MPLAYER_SET_AUTO_QUALITY,HSPPQualityadj->value,0 );
break;
}
return FALSE;
@@ -749,7 +749,7 @@ static void prToggled( GtkToggleButton *
case 5:
case 6:
case 7:
- mplayer( MPLAYER_SET_FONT_AUTOSCALE,(int)user_data - 4,NULL );
+ mplayer( MPLAYER_SET_FONT_AUTOSCALE,(int)user_data - 4,0 );
break;
case 8:
if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBCache ) ) ) gtk_widget_set_sensitive( SBCache,TRUE );
More information about the MPlayer-cvslog
mailing list