Rename “audio out type” to “audio output type” in the BaconVideoWidget API

This makes things more consistent, and has to be done before we reach the
API freeze for 3.0 if it's to be done at all, because BvwAudioOutputType is
effectively public API, since it's used in our GSettings schema.

5 files changed, 24 insertions, 24 deletions

diff --git a/data/org.gnome.totem.gschema.xml.in.in b/data/org.gnome.totem.gschema.xml.in.in
index 4d45eb831..bb4d5aafe 100644
--- a/data/org.gnome.totem.gschema.xml.in.in
+++ b/data/org.gnome.totem.gschema.xml.in.in
@@ -56,7 +56,7 @@
 			<default>false</default>
 			<_summary>Whether to enable debug for the playback engine</_summary>
 		</key>
-		<key name="audio-output-type" enum="org.gnome.totem.BvwAudioOutType">
+		<key name="audio-output-type" enum="org.gnome.totem.BvwAudioOutputType">
 			<default>'stereo'</default>
 			<_summary>Type of audio output to use</_summary>
 		</key>
diff --git a/docs/reference/totem-sections.txt b/docs/reference/totem-sections.txt
index 98fdbce2e..5b431271c 100644
--- a/docs/reference/totem-sections.txt
+++ b/docs/reference/totem-sections.txt
@@ -176,7 +176,7 @@ TotemCellRendererVideoPrivate
 BaconVideoWidget
 BaconVideoWidgetClass
 BvwAspectRatio
-BvwAudioOutType
+BvwAudioOutputType
 BvwConnectionSpeed
 BvwDVDEvent
 BvwMetadataType
@@ -200,8 +200,8 @@ bacon_video_widget_dvd_event
 bacon_video_widget_has_menus
 bacon_video_widget_get_aspect_ratio
 bacon_video_widget_set_aspect_ratio
-bacon_video_widget_get_audio_out_type
-bacon_video_widget_set_audio_out_type
+bacon_video_widget_get_audio_output_type
+bacon_video_widget_set_audio_output_type
 bacon_video_widget_get_auto_resize
 bacon_video_widget_set_auto_resize
 bacon_video_widget_get_backend_name
@@ -250,7 +250,7 @@ bacon_video_widget_is_seekable
 bacon_video_widget_step
 <SUBSECTION Standard>
 BVW_TYPE_ASPECT_RATIO
-BVW_TYPE_AUDIO_OUT_TYPE
+BVW_TYPE_AUDIO_OUTPUT_TYPE
 BVW_TYPE_CONNECTION_SPEED
 BVW_TYPE_DVD_EVENT
 BVW_TYPE_ERROR
@@ -259,7 +259,7 @@ BVW_TYPE_USE_TYPE
 BVW_TYPE_VIDEO_PROPERTY
 BVW_TYPE_VISUALIZATION_QUALITY
 bvw_aspect_ratio_get_type
-bvw_audio_out_type_get_type
+bvw_audio_output_type_get_type
 bvw_connection_speed_get_type
 bvw_dvd_event_get_type
 bvw_error_get_type
diff --git a/src/backend/bacon-video-widget-gst-0.10.c b/src/backend/bacon-video-widget-gst-0.10.c
index 4a0c6a1eb..8582a6ad2 100644
--- a/src/backend/bacon-video-widget-gst-0.10.c
+++ b/src/backend/bacon-video-widget-gst-0.10.c
@@ -239,7 +239,7 @@ struct BaconVideoWidgetPrivate
   
   gchar                       *media_device;
 
-  BvwAudioOutType	       speakersetup;
+  BvwAudioOutputType           speakersetup;
   gint                         connection_speed;
 
   GstMessageType               ignore_messages_mask;
@@ -1238,7 +1238,7 @@ bacon_video_widget_class_init (BaconVideoWidgetClass * klass)
    **/
   g_object_class_install_property (object_class, PROP_AUDIO_OUTPUT_TYPE,
                                    g_param_spec_enum ("audio-output-type", NULL,
-                                                      NULL, BVW_TYPE_AUDIO_OUT_TYPE,
+                                                      NULL, BVW_TYPE_AUDIO_OUTPUT_TYPE,
                                                       BVW_AUDIO_SOUND_STEREO,
                                                       G_PARAM_READWRITE |
                                                       G_PARAM_STATIC_STRINGS));
@@ -2876,7 +2876,7 @@ bacon_video_widget_set_property (GObject * object, guint property_id,
       bacon_video_widget_set_video_property (bvw, BVW_VIDEO_HUE, g_value_get_int (value));
       break;
     case PROP_AUDIO_OUTPUT_TYPE:
-      bacon_video_widget_set_audio_out_type (bvw, g_value_get_enum (value));
+      bacon_video_widget_set_audio_output_type (bvw, g_value_get_enum (value));
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -2953,7 +2953,7 @@ bacon_video_widget_get_property (GObject * object, guint property_id,
       g_value_set_int (value, bacon_video_widget_get_video_property (bvw, BVW_VIDEO_HUE));
       break;
     case PROP_AUDIO_OUTPUT_TYPE:
-      g_value_set_enum (value, bacon_video_widget_get_audio_out_type (bvw));
+      g_value_set_enum (value, bacon_video_widget_get_audio_output_type (bvw));
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -3477,16 +3477,16 @@ set_audio_filter (BaconVideoWidget *bvw)
 }
 
 /**
- * bacon_video_widget_get_audio_out_type:
+ * bacon_video_widget_get_audio_output_type:
  * @bvw: a #BaconVideoWidget
  *
  * Returns the current audio output type (e.g. how many speaker channels)
- * from #BaconVideoWidgetAudioOutType.
+ * from #BaconVideoWidgetAudioOutputType.
  *
  * Return value: the audio output type, or %-1
  **/
-BvwAudioOutType
-bacon_video_widget_get_audio_out_type (BaconVideoWidget *bvw)
+BvwAudioOutputType
+bacon_video_widget_get_audio_output_type (BaconVideoWidget *bvw)
 {
   g_return_val_if_fail (bvw != NULL, -1);
   g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), -1);
@@ -3495,15 +3495,15 @@ bacon_video_widget_get_audio_out_type (BaconVideoWidget *bvw)
 }
 
 /**
- * bacon_video_widget_set_audio_out_type:
+ * bacon_video_widget_set_audio_output_type:
  * @bvw: a #BaconVideoWidget
  * @type: the new audio output type
  *
  * Sets the audio output type (number of speaker channels) in the video widget.
  **/
 void
-bacon_video_widget_set_audio_out_type (BaconVideoWidget *bvw,
-                                       BvwAudioOutType type)
+bacon_video_widget_set_audio_output_type (BaconVideoWidget *bvw,
+                                          BvwAudioOutputType type)
 {
   g_return_if_fail (bvw != NULL);
   g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
diff --git a/src/backend/bacon-video-widget.h b/src/backend/bacon-video-widget.h
index 78293ceb6..25bc80a7f 100644
--- a/src/backend/bacon-video-widget.h
+++ b/src/backend/bacon-video-widget.h
@@ -478,7 +478,7 @@ GdkPixbuf *bacon_video_widget_get_current_frame (BaconVideoWidget *bvw);
 
 /* Audio-out functions */
 /**
- * BvwAudioOutType:
+ * BvwAudioOutputType:
  * @BVW_AUDIO_SOUND_STEREO: stereo output
  * @BVW_AUDIO_SOUND_4CHANNEL: 4-channel output
  * @BVW_AUDIO_SOUND_41CHANNEL: 4.1-channel output
@@ -486,7 +486,7 @@ GdkPixbuf *bacon_video_widget_get_current_frame (BaconVideoWidget *bvw);
  * @BVW_AUDIO_SOUND_51CHANNEL: 5.1-channel output
  * @BVW_AUDIO_SOUND_AC3PASSTHRU: AC3 passthrough output
  *
- * The audio output types available for use with bacon_video_widget_set_audio_out_type().
+ * The audio output types available for use with bacon_video_widget_set_audio_output_type().
  **/
 typedef enum {
 	BVW_AUDIO_SOUND_STEREO,
@@ -495,12 +495,12 @@ typedef enum {
 	BVW_AUDIO_SOUND_5CHANNEL,
 	BVW_AUDIO_SOUND_51CHANNEL,
 	BVW_AUDIO_SOUND_AC3PASSTHRU
-} BvwAudioOutType;
+} BvwAudioOutputType;
 
-BvwAudioOutType bacon_video_widget_get_audio_out_type
+BvwAudioOutputType bacon_video_widget_get_audio_output_type
 						 (BaconVideoWidget *bvw);
-void bacon_video_widget_set_audio_out_type       (BaconVideoWidget *bvw,
-						  BvwAudioOutType type);
+void bacon_video_widget_set_audio_output_type    (BaconVideoWidget *bvw,
+						  BvwAudioOutputType type);
 
 G_END_DECLS
 
diff --git a/src/totem-preferences.c b/src/totem-preferences.c
index edd421594..af719c62b 100644
--- a/src/totem-preferences.c
+++ b/src/totem-preferences.c
@@ -463,7 +463,7 @@ totem_setup_preferences (Totem *totem)
 	                 G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET | G_SETTINGS_BIND_NO_SENSITIVITY);
 	g_settings_bind_with_mapping (totem->settings, "audio-output-type", item, "active", G_SETTINGS_BIND_DEFAULT,
 	                              (GSettingsBindGetMapping) int_enum_get_mapping, (GSettingsBindSetMapping) int_enum_set_mapping,
-	                              g_type_class_ref (BVW_TYPE_AUDIO_OUT_TYPE), (GDestroyNotify) g_type_class_unref);
+	                              g_type_class_ref (BVW_TYPE_AUDIO_OUTPUT_TYPE), (GDestroyNotify) g_type_class_unref);
 
 	/* Subtitle font selection */
 	item = gtk_builder_get_object (totem->xml, "font_sel_button");