[MPlayer-cvslog] r37988 - in trunk: gui/dialog/preferences.c help/help_mp-de.h help/help_mp-en.h

[ib]

Author: ib
Date: Mon Oct  9 15:51:58 2017
New Revision: 37988

Log:
Make ReplayGain options configurable through GUI's preferences dialog.

ReplayGain support can be enabled or disabled.

If it's enabled, an additional adjustment can be selected from within
the allowed range.

Modified:
   trunk/gui/dialog/preferences.c

Changes in other areas also in this revision:
Modified:
   trunk/help/help_mp-de.h
   trunk/help/help_mp-en.h

Modified: trunk/gui/dialog/preferences.c
==============================================================================
--- trunk/gui/dialog/preferences.c	Mon Oct  9 12:58:49 2017	(r37987)
+++ trunk/gui/dialog/preferences.c	Mon Oct  9 15:51:58 2017	(r37988)
@@ -86,6 +86,7 @@ static GtkWidget * CBAFM;
 static GtkWidget * CBAudioEqualizer;
 //static GtkWidget * CBSurround;
 static GtkWidget * CBExtraStereo;
+static GtkWidget * CBReplayGain;
 static GtkWidget * CBNormalize;
 static GtkWidget * CBSoftwareMixer;
 static GtkWidget * CBDoubleBuffer;
@@ -137,6 +138,9 @@ static GtkWidget * HSSubFPS;
 static GtkWidget * HSPPQuality;
 static GtkWidget * HSFPS;
 
+static GtkWidget *RGbox;
+static GtkObject *RGadj;
+
 static GtkAdjustment * HSExtraStereoMuladj, * HSAudioDelayadj, * HSPanscanadj, * HSSubDelayadj;
 static GtkAdjustment * HSSubPositionadj, * HSSubFPSadj, * HSPPQualityadj, * HSFPSadj;
 
@@ -286,6 +290,8 @@ static void prButton( GtkButton * button
   {
    case bOk:
         /* 1st page */
+        gtkReplayGainOn = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(CBReplayGain));
+        gtkReplayGainAdjustment = GTK_ADJUSTMENT(RGadj)->value;
         gtkEnableAudioEqualizer=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBAudioEqualizer ) );
         gtkAOExtraStereo=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBExtraStereo ) );
         gtkAONorm=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNormalize ) );
@@ -532,6 +538,9 @@ static void prToggled( GtkToggleButton *
          }
         break;
 #endif
+  case 11:
+    gtk_widget_set_sensitive(RGbox, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(CBReplayGain)));
+    break;
   }
 }
 
@@ -612,6 +621,8 @@ static GtkWidget * CreatePreferences( vo
   GtkWidget * hbox9;
   GtkWidget * hbox91;
   GtkWidget * hbox92;
+  GtkWidget * hbox10;
+  GtkWidget * RGspin;
 
   accel_group=gtk_accel_group_new();
 
@@ -660,6 +671,18 @@ static GtkWidget * CreatePreferences( vo
       gtkAddFrame( NULL,GTK_SHADOW_ETCHED_OUT,hbox1,0 ),1 ),0 );
     gtk_widget_set_usize( vbox3,250,-2 );
 
+  hbox10 = gtkAddHBox(vbox3, 1);
+  CBReplayGain = gtkAddCheckButton(MSGTR_GUI_ReplayGain, hbox10);
+  RGbox = gtkAddHBox(hbox10, 1);
+  gtkAddLabel(MSGTR_GUI_ReplayGainAdjustment, RGbox);
+  RGadj = gtk_adjustment_new(gtkReplayGainAdjustment, -30, 10, 1, 5, 0);
+  RGspin = gtk_spin_button_new(GTK_ADJUSTMENT(RGadj), 1, 0);
+  gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(RGspin), TRUE);
+  gtk_box_pack_start(GTK_BOX(RGbox), GTK_WIDGET(RGspin), FALSE, FALSE, 0);
+  gtkAddLabel(MSGTR_GUI_dB, RGbox);
+  gtk_widget_set_sensitive(RGbox, gtkReplayGainOn);
+  gtk_widget_show(RGspin);
+
   CBNormalize=gtkAddCheckButton( MSGTR_GUI_NormalizeSound,vbox3 );
   CBAudioEqualizer=gtkAddCheckButton( MSGTR_GUI_EnableEqualizer,vbox3 );
   CBSoftwareMixer=gtkAddCheckButton( MSGTR_GUI_EnableSoftwareMixer,vbox3 );
@@ -1182,6 +1205,8 @@ void ShowPreferences( void )
 #if 0
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSurround ),gtkAOSurround );
 #endif
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CBReplayGain), gtkReplayGainOn);
+ gtk_adjustment_set_value(GTK_ADJUSTMENT(RGadj), gtkReplayGainAdjustment);
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBExtraStereo ),gtkAOExtraStereo );
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBNormalize ),gtkAONorm );
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSoftwareMixer ),soft_vol );
@@ -1427,6 +1452,7 @@ void ShowPreferences( void )
 #ifdef CONFIG_ASS
  gtk_signal_connect( GTK_OBJECT( CBUseASS ),"toggled",GTK_SIGNAL_FUNC( prToggled ),GINT_TO_POINTER(10));
 #endif
+ gtk_signal_connect(GTK_OBJECT(CBReplayGain), "toggled", GTK_SIGNAL_FUNC(prToggled), GINT_TO_POINTER(11));
 
  gtk_signal_connect( GTK_OBJECT( HSExtraStereoMul ),"motion-notify-event",GTK_SIGNAL_FUNC( prHScaler ),GINT_TO_POINTER(0) );
  gtk_signal_connect( GTK_OBJECT( HSAudioDelay ),"motion-notify-event",GTK_SIGNAL_FUNC( prHScaler ),GINT_TO_POINTER(1) );