brasero r1683 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Fri Jan  2 09:41:48 2009
New Revision: 1683
URL: http://svn.gnome.org/viewvc/brasero?rev=1683&view=rev

Log:
2009-01-02  Philippe Rouquier  <ykw localhost localdomain>

	Strip off options to choose audio stream types for video DVD as they are
	useless. Now default to AC3.

	* src/brasero-disc-option-dialog.c (brasero_disc_option_audio_AC3),
	(brasero_disc_option_audio_MP2),
	(brasero_disc_option_dialog_update_video),
	(brasero_disc_option_dialog_add_video_options),
	(brasero_disc_option_dialog_valid_media_cb):


Modified:
   trunk/ChangeLog
   trunk/src/brasero-disc-option-dialog.c

Modified: trunk/src/brasero-disc-option-dialog.c
==============================================================================
--- trunk/src/brasero-disc-option-dialog.c	(original)
+++ trunk/src/brasero-disc-option-dialog.c	Fri Jan  2 09:41:48 2009
@@ -60,7 +60,6 @@
 	GtkWidget *joliet_toggle;
 
 	GtkWidget *video_options;
-	GtkWidget *dvd_audio;
 	GtkWidget *vcd_label;
 	GtkWidget *vcd_button;
 	GtkWidget *svcd_button;
@@ -76,6 +75,43 @@
 
 static GtkDialogClass *parent_class = NULL;
 
+
+static void
+brasero_disc_option_audio_AC3 (BraseroDiscOptionDialog *dialog)
+{
+	BraseroBurnSession *session;
+	GValue *value = NULL;
+
+	session = brasero_burn_options_get_session (BRASERO_BURN_OPTIONS (dialog));
+
+	value = g_new0 (GValue, 1);
+	g_value_init (value, G_TYPE_INT);
+	g_value_set_int (value, BRASERO_AUDIO_FORMAT_AC3);
+	brasero_burn_session_tag_add (session,
+				      BRASERO_DVD_AUDIO_STREAMS,
+				      value);
+
+	g_object_unref (session);
+}
+
+static void
+brasero_disc_option_audio_MP2 (BraseroDiscOptionDialog *dialog)
+{
+	BraseroBurnSession *session;
+	GValue *value = NULL;
+
+	session = brasero_burn_options_get_session (BRASERO_BURN_OPTIONS (dialog));
+
+	value = g_new0 (GValue, 1);
+	g_value_init (value, G_TYPE_INT);
+	g_value_set_int (value, BRASERO_AUDIO_FORMAT_MP2);
+	brasero_burn_session_tag_add (session,
+				      BRASERO_DVD_AUDIO_STREAMS,
+				      value);
+
+	g_object_unref (session);
+}
+
 /**
  * These functions are used when caps-changed event or drive-changed event
  * are generated. They are used to check that flags or fs are valid.
@@ -151,17 +187,21 @@
 
 	priv = BRASERO_DISC_OPTION_DIALOG_PRIVATE (dialog);
 
+	/* means we haven't initialized yet */
+	if (!priv->vcd_label)
+		return;
+
 	session = brasero_burn_options_get_session (BRASERO_BURN_OPTIONS (dialog));
 	media = brasero_burn_session_get_dest_media (session);
 
 	if (media & BRASERO_MEDIUM_DVD) {
-		gtk_widget_show (priv->dvd_audio);
+		brasero_disc_option_audio_AC3 (dialog);
 		gtk_widget_hide (priv->vcd_label);
 		gtk_widget_hide (priv->vcd_button);
 		gtk_widget_hide (priv->svcd_button);
 	}
 	else if (media & BRASERO_MEDIUM_CD) {
-		gtk_widget_hide (priv->dvd_audio);
+		brasero_disc_option_audio_MP2 (dialog);
 		gtk_widget_show (priv->vcd_label);
 		gtk_widget_show (priv->vcd_button);
 		gtk_widget_show (priv->svcd_button);
@@ -177,13 +217,13 @@
 		}
 
 		if (format == BRASERO_IMAGE_FORMAT_CUE) {
-			gtk_widget_hide (priv->dvd_audio);
+			brasero_disc_option_audio_MP2 (dialog);
 			gtk_widget_show (priv->vcd_label);
 			gtk_widget_show (priv->vcd_button);
 			gtk_widget_show (priv->svcd_button);
 		}
 		else if (format == BRASERO_IMAGE_FORMAT_BIN) {
-			gtk_widget_show (priv->dvd_audio);
+			brasero_disc_option_audio_AC3 (dialog);
 			gtk_widget_hide (priv->vcd_label);
 			gtk_widget_hide (priv->vcd_button);
 			gtk_widget_hide (priv->svcd_button);
@@ -343,74 +383,6 @@
 }
 
 static void
-brasero_disc_option_dialog_AC3 (GtkToggleButton *button,
-				BraseroDiscOptionDialog *dialog)
-{
-	BraseroBurnSession *session;
-	BraseroAudioFormat format;
-	GValue *value = NULL;
-
-	session = brasero_burn_options_get_session (BRASERO_BURN_OPTIONS (dialog));
-
-	brasero_burn_session_tag_lookup (session,
-					 BRASERO_DVD_AUDIO_STREAMS,
-					 &value);
-
-	if (value)
-		format = g_value_get_int (value);
-	else
-		format = BRASERO_AUDIO_FORMAT_NONE;
-
-	if (gtk_toggle_button_get_active (button))
-		format |= BRASERO_AUDIO_FORMAT_AC3;
-	else
-		format &= ~BRASERO_AUDIO_FORMAT_AC3;
-
-	value = g_new0 (GValue, 1);
-	g_value_init (value, G_TYPE_INT);
-	g_value_set_int (value, format);
-	brasero_burn_session_tag_add (session,
-				      BRASERO_DVD_AUDIO_STREAMS,
-				      value);
-
-	g_object_unref (session);
-}
-
-static void
-brasero_disc_option_dialog_MP2 (GtkToggleButton *button,
-				BraseroDiscOptionDialog *dialog)
-{
-	BraseroBurnSession *session;
-	BraseroAudioFormat format;
-	GValue *value = NULL;
-
-	session = brasero_burn_options_get_session (BRASERO_BURN_OPTIONS (dialog));
-
-	brasero_burn_session_tag_lookup (session,
-					 BRASERO_DVD_AUDIO_STREAMS,
-					 &value);
-
-	if (value)
-		format = g_value_get_int (value);
-	else
-		format = BRASERO_AUDIO_FORMAT_NONE;
-
-	if (gtk_toggle_button_get_active (button))
-		format |= BRASERO_AUDIO_FORMAT_MP2;
-	else
-		format &= ~BRASERO_AUDIO_FORMAT_MP2;
-
-	value = g_new0 (GValue, 1);
-	g_value_init (value, G_TYPE_INT);
-	g_value_set_int (value, format);
-	brasero_burn_session_tag_add (session,
-				      BRASERO_DVD_AUDIO_STREAMS,
-				      value);
-
-	g_object_unref (session);
-}
-
-static void
 brasero_disc_option_dialog_set_tag (BraseroDiscOptionDialog *dialog,
 				    const gchar *tag,
 				    gint contents)
@@ -686,28 +658,9 @@
 
 	gtk_box_pack_start (GTK_BOX (widget), options, FALSE, FALSE, 0);
 
-	/* Audio options for DVDs */
-	button1 = gtk_check_button_new_with_mnemonic (_("Add _AC3 audio stream"));
-	button2 = gtk_check_button_new_with_mnemonic (_("Add _MP2 audio stream"));
-
-	string = g_strdup_printf ("<b>%s</b>", _("Audio Options"));
-	options = brasero_utils_pack_properties (string,
-						 button1,
-						 button2,
-						 NULL);
-	g_free (string);
-
-	g_signal_connect (button1,
-			  "clicked",
-			  G_CALLBACK (brasero_disc_option_dialog_AC3),
-			  dialog);
-	g_signal_connect (button2,
-			  "clicked",
-			  G_CALLBACK (brasero_disc_option_dialog_MP2),
-			  dialog);
-
-	gtk_box_pack_start (GTK_BOX (widget), options, FALSE, FALSE, 0);
-	priv->dvd_audio = options;
+	/* NOTE: audio options for DVDs were removed. For SVCD that is MP2 and
+	 * for Video DVD even if we have a choice AC3 is the most widespread
+	 * audio format. So use AC3 by default. */
 
 	gtk_widget_show_all (widget);
 	brasero_disc_option_dialog_update_video (dialog);
@@ -797,9 +750,8 @@
 	/* update the joliet button */
 	brasero_disc_option_dialog_update_joliet (self);
 
-	/* for video disc see what's the output : CD or DVD */
-	if (priv->dvd_audio)
-		brasero_disc_option_dialog_update_video (self);
+	/* for video disc see what's the output: CD or DVD */
+	brasero_disc_option_dialog_update_video (self);
 }
 
 static void