GNOME/libgnome-volume-control
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libgnome-volume-control.git synced 2024-11-21 08:20:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix introspection support

Browse Source 
Fix includes, comments and parameter names so that introspection builds
without warnings.
This commit is contained in:
Giovanni Campagna 2012-10-19 20:00:47 +02:00
parent 698b3a5f60
commit a1448acc5b
18 changed files with 49 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gvc-channel-bar.c
View File

@ -369,6 +369,12 @@ gvc_channel_bar_set_adjustment (GvcChannelBar *bar,
g_object_notify (G_OBJECT (bar), "adjustment"); g_object_notify (G_OBJECT (bar), "adjustment");
} }
/**
* gvc_channel_bar_get_adjustment:
* @bar:
*
* Returns: (transfer none):
*/
GtkAdjustment * GtkAdjustment *
gvc_channel_bar_get_adjustment (GvcChannelBar *bar) gvc_channel_bar_get_adjustment (GvcChannelBar *bar)
{ {

1
gvc-channel-bar.h
View File

@ -22,6 +22,7 @@
#define __GVC_CHANNEL_BAR_H #define __GVC_CHANNEL_BAR_H
#include <glib-object.h> #include <glib-object.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS G_BEGIN_DECLS

1
gvc-channel-map.c
View File

@ -122,7 +122,6 @@ gvc_channel_map_get_mapping (const GvcChannelMap *map)
/** /**
* gvc_channel_map_has_position: (skip) * gvc_channel_map_has_position: (skip)
*
* @map: * @map:
* @position: * @position:
* *

8
gvc-mixer-card.c
View File

@ -148,7 +148,6 @@ gvc_mixer_card_set_icon_name (GvcMixerCard *card,
/** /**
* gvc_mixer_card_get_profile: (skip) * gvc_mixer_card_get_profile: (skip)
*
* @card: * @card:
* *
* Returns: * Returns:
@ -325,10 +324,9 @@ gvc_mixer_card_set_profiles (GvcMixerCard *card,
/** /**
* gvc_mixer_card_get_gicon: * gvc_mixer_card_get_gicon:
*
* @card: * @card:
* *
* Return value: (transfer full) (element-type GIcon): * Return value: (transfer full):
*/ */
GIcon * GIcon *
gvc_mixer_card_get_gicon (GvcMixerCard *card) gvc_mixer_card_get_gicon (GvcMixerCard *card)
@ -343,11 +341,11 @@ gvc_mixer_card_get_gicon (GvcMixerCard *card)
/** /**
* gvc_mixer_card_set_ports: * gvc_mixer_card_set_ports:
* @profiles: (transfer full) (element-type GvcMixerCardPort): * @ports: (transfer full) (element-type GvcMixerCardPort):
*/ */
gboolean gboolean
gvc_mixer_card_set_ports (GvcMixerCard *card, gvc_mixer_card_set_ports (GvcMixerCard *card,
GList *ports) GList *ports)
{ {
g_return_val_if_fail (GVC_IS_MIXER_CARD (card), FALSE); g_return_val_if_fail (GVC_IS_MIXER_CARD (card), FALSE);
g_return_val_if_fail (card->priv->ports == NULL, FALSE); g_return_val_if_fail (card->priv->ports == NULL, FALSE);

18
gvc-mixer-control.c
View File

@ -134,7 +134,6 @@ gvc_mixer_control_get_pa_context (GvcMixerControl *control)
/** /**
* gvc_mixer_control_get_event_sink_input: * gvc_mixer_control_get_event_sink_input:
*
* @control: * @control:
* *
* Returns: (transfer none): * Returns: (transfer none):
@ -215,6 +214,7 @@ gvc_mixer_control_stream_restore_source_cb (pa_context *c,
* gvc_mixer_control_lookup_device_from_stream: * gvc_mixer_control_lookup_device_from_stream:
* @control: * @control:
* @stream: * @stream:
*
* Returns: (transfer none): a #GvcUIDevice or %NULL * Returns: (transfer none): a #GvcUIDevice or %NULL
*/ */
GvcMixerUIDevice * GvcMixerUIDevice *
@ -364,7 +364,6 @@ gvc_mixer_control_set_default_source (GvcMixerControl *control,
/** /**
* gvc_mixer_control_get_default_sink: * gvc_mixer_control_get_default_sink:
*
* @control: * @control:
* *
* Returns: (transfer none): * Returns: (transfer none):
@ -388,7 +387,6 @@ gvc_mixer_control_get_default_sink (GvcMixerControl *control)
/** /**
* gvc_mixer_control_get_default_source: * gvc_mixer_control_get_default_source:
*
* @control: * @control:
* *
* Returns: (transfer none): * Returns: (transfer none):
@ -420,7 +418,6 @@ gvc_mixer_control_lookup_id (GHashTable *hash_table,
/** /**
* gvc_mixer_control_lookup_stream_id: * gvc_mixer_control_lookup_stream_id:
*
* @control: * @control:
* @id: * @id:
* *
@ -437,7 +434,6 @@ gvc_mixer_control_lookup_stream_id (GvcMixerControl *control,
/** /**
* gvc_mixer_control_lookup_card_id: * gvc_mixer_control_lookup_card_id:
*
* @control: * @control:
* @id: * @id:
* *
@ -456,6 +452,7 @@ gvc_mixer_control_lookup_card_id (GvcMixerControl *control,
* gvc_mixer_control_lookup_output_id: * gvc_mixer_control_lookup_output_id:
* @control: * @control:
* @id: * @id:
*
* Returns: (transfer none): * Returns: (transfer none):
*/ */
GvcMixerUIDevice * GvcMixerUIDevice *
@ -471,6 +468,7 @@ gvc_mixer_control_lookup_output_id (GvcMixerControl *control,
* gvc_mixer_control_lookup_input_id: * gvc_mixer_control_lookup_input_id:
* @control: * @control:
* @id: * @id:
*
* Returns: (transfer none): * Returns: (transfer none):
*/ */
GvcMixerUIDevice * GvcMixerUIDevice *
@ -486,6 +484,7 @@ gvc_mixer_control_lookup_input_id (GvcMixerControl *control,
* gvc_mixer_control_get_stream_from_device: * gvc_mixer_control_get_stream_from_device:
* @control: * @control:
* @device: * @device:
*
* Returns: (transfer none): * Returns: (transfer none):
*/ */
GvcMixerStream * GvcMixerStream *
@ -511,6 +510,7 @@ gvc_mixer_control_get_stream_from_device (GvcMixerControl *control,
* @control: * @control:
* @device: * @device:
* @profile: Can be null if any profile present on this port is okay * @profile: Can be null if any profile present on this port is okay
*
* Returns: This method will attempt to swap the profile on the card of * Returns: This method will attempt to swap the profile on the card of
* the device with given profile name. If successfull it will set the * the device with given profile name. If successfull it will set the
* preferred profile on that device so as we know the next time the user * preferred profile on that device so as we know the next time the user
@ -749,7 +749,6 @@ gvc_card_collate (GvcMixerCard *a,
/** /**
* gvc_mixer_control_get_cards: * gvc_mixer_control_get_cards:
*
* @control: * @control:
* *
* Returns: (transfer container) (element-type Gvc.MixerCard): * Returns: (transfer container) (element-type Gvc.MixerCard):
@ -786,7 +785,6 @@ gvc_stream_collate (GvcMixerStream *a,
/** /**
* gvc_mixer_control_get_streams: * gvc_mixer_control_get_streams:
*
* @control: * @control:
* *
* Returns: (transfer container) (element-type Gvc.MixerStream): * Returns: (transfer container) (element-type Gvc.MixerStream):
@ -807,7 +805,6 @@ gvc_mixer_control_get_streams (GvcMixerControl *control)
/** /**
* gvc_mixer_control_get_sinks: * gvc_mixer_control_get_sinks:
*
* @control: * @control:
* *
* Returns: (transfer container) (element-type Gvc.MixerSink): * Returns: (transfer container) (element-type Gvc.MixerSink):
@ -828,7 +825,6 @@ gvc_mixer_control_get_sinks (GvcMixerControl *control)
/** /**
* gvc_mixer_control_get_sources: * gvc_mixer_control_get_sources:
*
* @control: * @control:
* *
* Returns: (transfer container) (element-type Gvc.MixerSource): * Returns: (transfer container) (element-type Gvc.MixerSource):
@ -849,7 +845,6 @@ gvc_mixer_control_get_sources (GvcMixerControl *control)
/** /**
* gvc_mixer_control_get_sink_inputs: * gvc_mixer_control_get_sink_inputs:
*
* @control: * @control:
* *
* Returns: (transfer container) (element-type Gvc.MixerSinkInput): * Returns: (transfer container) (element-type Gvc.MixerSinkInput):
@ -870,7 +865,6 @@ gvc_mixer_control_get_sink_inputs (GvcMixerControl *control)
/** /**
* gvc_mixer_control_get_source_outputs: * gvc_mixer_control_get_source_outputs:
*
* @control: * @control:
* *
* Returns: (transfer container) (element-type Gvc.MixerSourceOutput): * Returns: (transfer container) (element-type Gvc.MixerSourceOutput):
@ -1863,7 +1857,7 @@ card_num_streams_to_status (guint sinks,
return ret; return ret;
} }
/** /*
* A utility method to gather which card profiles are relevant to the port . * A utility method to gather which card profiles are relevant to the port .
*/ */
static GList * static GList *

2
gvc-mixer-control.h
View File

@ -124,7 +124,7 @@ void gvc_mixer_control_change_output (Gvc
void gvc_mixer_control_change_input (GvcMixerControl *control, void gvc_mixer_control_change_input (GvcMixerControl *control,
GvcMixerUIDevice* input); GvcMixerUIDevice* input);
GvcMixerStream* gvc_mixer_control_get_stream_from_device (GvcMixerControl *control, GvcMixerStream* gvc_mixer_control_get_stream_from_device (GvcMixerControl *control,
GvcMixerUIDevice *dev); GvcMixerUIDevice *device);
gboolean gvc_mixer_control_change_profile_on_selected_device (GvcMixerControl *control, gboolean gvc_mixer_control_change_profile_on_selected_device (GvcMixerControl *control,
GvcMixerUIDevice *device, GvcMixerUIDevice *device,
const gchar* profile); const gchar* profile);

3
gvc-mixer-event-role.c
View File

@ -210,9 +210,8 @@ gvc_mixer_event_role_finalize (GObject *object)
/** /**
* gvc_mixer_event_role_new: (skip) * gvc_mixer_event_role_new: (skip)
*
* @context: * @context:
* @index: * @device:
* @channel_map: * @channel_map:
* *
* Returns: * Returns:

1
gvc-mixer-sink-input.c
View File

@ -142,7 +142,6 @@ gvc_mixer_sink_input_finalize (GObject *object)
/** /**
* gvc_mixer_sink_input_new: (skip) * gvc_mixer_sink_input_new: (skip)
*
* @context: * @context:
* @index: * @index:
* @channel_map: * @channel_map:

2
gvc-mixer-sink-input.h
View File

@ -50,7 +50,7 @@ GType gvc_mixer_sink_input_get_type (void);
GvcMixerStream * gvc_mixer_sink_input_new (pa_context *context, GvcMixerStream * gvc_mixer_sink_input_new (pa_context *context,
guint index, guint index,
GvcChannelMap *map); GvcChannelMap *channel_map);
G_END_DECLS G_END_DECLS

1
gvc-mixer-sink.c
View File

@ -171,7 +171,6 @@ gvc_mixer_sink_finalize (GObject *object)
/** /**
* gvc_mixer_sink_new: (skip) * gvc_mixer_sink_new: (skip)
*
* @context: * @context:
* @index: * @index:
* @channel_map: * @channel_map:

2
gvc-mixer-sink.h
View File

@ -50,7 +50,7 @@ GType gvc_mixer_sink_get_type (void);
GvcMixerStream * gvc_mixer_sink_new (pa_context *context, GvcMixerStream * gvc_mixer_sink_new (pa_context *context,
guint index, guint index,
GvcChannelMap *map); GvcChannelMap *channel_map);
G_END_DECLS G_END_DECLS

1
gvc-mixer-source-output.c
View File

@ -97,7 +97,6 @@ gvc_mixer_source_output_finalize (GObject *object)
/** /**
* gvc_mixer_source_output_new: (skip) * gvc_mixer_source_output_new: (skip)
*
* @context: * @context:
* @index: * @index:
* @channel_map: * @channel_map:

2
gvc-mixer-source-output.h
View File

@ -50,7 +50,7 @@ GType gvc_mixer_source_output_get_type (void);
GvcMixerStream * gvc_mixer_source_output_new (pa_context *context, GvcMixerStream * gvc_mixer_source_output_new (pa_context *context,
guint index, guint index,
GvcChannelMap *map); GvcChannelMap *channel_map);
G_END_DECLS G_END_DECLS

1
gvc-mixer-source.c
View File

@ -171,7 +171,6 @@ gvc_mixer_source_finalize (GObject *object)
/** /**
* gvc_mixer_source_new: (skip) * gvc_mixer_source_new: (skip)
*
* @context: * @context:
* @index: * @index:
* @channel_map: * @channel_map:

2
gvc-mixer-source.h
View File

@ -50,7 +50,7 @@ GType gvc_mixer_source_get_type (void);
GvcMixerStream * gvc_mixer_source_new (pa_context *context, GvcMixerStream * gvc_mixer_source_new (pa_context *context,
guint index, guint index,
GvcChannelMap *map); GvcChannelMap *channel_map);
G_END_DECLS G_END_DECLS

4
gvc-mixer-stream.c
View File

@ -132,7 +132,6 @@ gvc_mixer_stream_get_channel_map (GvcMixerStream *stream)
/** /**
* gvc_mixer_stream_get_volume: * gvc_mixer_stream_get_volume:
*
* @stream: * @stream:
* *
* Returns: (type guint32) (transfer none): * Returns: (type guint32) (transfer none):
@ -156,7 +155,6 @@ gvc_mixer_stream_get_decibel (GvcMixerStream *stream)
/** /**
* gvc_mixer_stream_set_volume: * gvc_mixer_stream_set_volume:
*
* @stream: * @stream:
* @volume: (type guint32): * @volume: (type guint32):
* *
@ -442,7 +440,6 @@ gvc_mixer_stream_set_sysfs_path (GvcMixerStream *stream,
/** /**
* gvc_mixer_stream_get_base_volume: * gvc_mixer_stream_get_base_volume:
*
* @stream: * @stream:
* *
* Returns: (type guint32) (transfer none): * Returns: (type guint32) (transfer none):
@ -457,7 +454,6 @@ gvc_mixer_stream_get_base_volume (GvcMixerStream *stream)
/** /**
* gvc_mixer_stream_set_base_volume: * gvc_mixer_stream_set_base_volume:
*
* @stream: * @stream:
* @base_volume: (type guint32): * @base_volume: (type guint32):
* *

16
gvc-mixer-ui-device.c
View File

@ -378,8 +378,7 @@ add_canonical_names_of_profiles (GvcMixerUIDevice *device,
/** /**
* gvc_mixer_ui_device_set_profiles: * gvc_mixer_ui_device_set_profiles:
* * @in_profiles: (element-type Gvc.MixerCardProfile): a list of GvcMixerCardProfile
* @in_profiles: a list of GvcMixerCardProfile
* *
* Assigns value to * Assigns value to
* - device->priv->profiles (profiles to be added to combobox) * - device->priv->profiles (profiles to be added to combobox)
@ -430,7 +429,6 @@ gvc_mixer_ui_device_set_profiles (GvcMixerUIDevice *device,
/** /**
* gvc_mixer_ui_device_get_best_profile: * gvc_mixer_ui_device_get_best_profile:
*
* @selected: The selected profile or its canonical name or %NULL for any profile * @selected: The selected profile or its canonical name or %NULL for any profile
* @current: The currently selected profile * @current: The currently selected profile
* *
@ -543,6 +541,12 @@ gvc_mixer_ui_device_should_profiles_be_hidden (GvcMixerUIDevice *device)
return device->priv->disable_profile_swapping; return device->priv->disable_profile_swapping;
} }
/**
* gvc_mixer_ui_device_get_profiles:
* @device:
*
* Returns: (transfer none) (element-type Gvc.MixerCardProfile):
*/
GList* GList*
gvc_mixer_ui_device_get_profiles (GvcMixerUIDevice *device) gvc_mixer_ui_device_get_profiles (GvcMixerUIDevice *device)
{ {
@ -551,6 +555,12 @@ gvc_mixer_ui_device_get_profiles (GvcMixerUIDevice *device)
return device->priv->profiles; return device->priv->profiles;
} }
/**
* gvc_mixer_ui_device_get_supported_profiles:
* @device:
*
* Returns: (transfer none) (element-type Gvc.MixerCardProfile):
*/
GList* GList*
gvc_mixer_ui_device_get_supported_profiles (GvcMixerUIDevice *device) gvc_mixer_ui_device_get_supported_profiles (GvcMixerUIDevice *device)
{ {

28
gvc-mixer-ui-device.h
View File

@ -53,29 +53,29 @@ typedef enum
GType gvc_mixer_ui_device_get_type (void) G_GNUC_CONST; GType gvc_mixer_ui_device_get_type (void) G_GNUC_CONST;
guint gvc_mixer_ui_device_get_id (GvcMixerUIDevice *dev); guint gvc_mixer_ui_device_get_id (GvcMixerUIDevice *device);
gint gvc_mixer_ui_device_get_stream_id (GvcMixerUIDevice *dev); gint gvc_mixer_ui_device_get_stream_id (GvcMixerUIDevice *device);
const gchar * gvc_mixer_ui_device_get_description (GvcMixerUIDevice *dev); const gchar * gvc_mixer_ui_device_get_description (GvcMixerUIDevice *device);
const gchar * gvc_mixer_ui_device_get_origin (GvcMixerUIDevice *dev); const gchar * gvc_mixer_ui_device_get_origin (GvcMixerUIDevice *device);
const gchar * gvc_mixer_ui_device_get_port (GvcMixerUIDevice *dev); const gchar * gvc_mixer_ui_device_get_port (GvcMixerUIDevice *device);
const gchar * gvc_mixer_ui_device_get_best_profile (GvcMixerUIDevice *dev, const gchar * gvc_mixer_ui_device_get_best_profile (GvcMixerUIDevice *device,
const gchar *selected, const gchar *selected,
const gchar *current); const gchar *current);
const gchar * gvc_mixer_ui_device_get_active_profile (GvcMixerUIDevice* device); const gchar * gvc_mixer_ui_device_get_active_profile (GvcMixerUIDevice* device);
const gchar * gvc_mixer_ui_device_get_matching_profile (GvcMixerUIDevice *dev, const gchar * gvc_mixer_ui_device_get_matching_profile (GvcMixerUIDevice *device,
const gchar *profile); const gchar *profile);
const gchar * gvc_mixer_ui_device_get_user_preferred_profile (GvcMixerUIDevice *dev); const gchar * gvc_mixer_ui_device_get_user_preferred_profile (GvcMixerUIDevice *device);
const gchar * gvc_mixer_ui_device_get_top_priority_profile (GvcMixerUIDevice *dev); const gchar * gvc_mixer_ui_device_get_top_priority_profile (GvcMixerUIDevice *device);
GList * gvc_mixer_ui_device_get_profiles (GvcMixerUIDevice *dev); GList * gvc_mixer_ui_device_get_profiles (GvcMixerUIDevice *device);
GList * gvc_mixer_ui_device_get_supported_profiles (GvcMixerUIDevice *device); GList * gvc_mixer_ui_device_get_supported_profiles (GvcMixerUIDevice *device);
gboolean gvc_mixer_ui_device_should_profiles_be_hidden (GvcMixerUIDevice *device); gboolean gvc_mixer_ui_device_should_profiles_be_hidden (GvcMixerUIDevice *device);
void gvc_mixer_ui_device_set_profiles (GvcMixerUIDevice *device, void gvc_mixer_ui_device_set_profiles (GvcMixerUIDevice *device,
const GList *profiles); const GList *in_profiles);
void gvc_mixer_ui_device_set_user_preferred_profile (GvcMixerUIDevice *device, void gvc_mixer_ui_device_set_user_preferred_profile (GvcMixerUIDevice *device,
const gchar *profile); const gchar *profile);
void gvc_mixer_ui_device_invalidate_stream (GvcMixerUIDevice *dev); void gvc_mixer_ui_device_invalidate_stream (GvcMixerUIDevice *device);
gboolean gvc_mixer_ui_device_has_ports (GvcMixerUIDevice *dev); gboolean gvc_mixer_ui_device_has_ports (GvcMixerUIDevice *device);
gboolean gvc_mixer_ui_device_is_output (GvcMixerUIDevice *dev); gboolean gvc_mixer_ui_device_is_output (GvcMixerUIDevice *device);
G_END_DECLS G_END_DECLS