summaryrefslogtreecommitdiff
path: root/backends/pulse/pulse-stream-control.h
diff options
context:
space:
mode:
authorMichal Ratajsky <[email protected]>2016-01-05 11:14:12 +0100
committerMichal Ratajsky <[email protected]>2016-01-05 11:18:38 +0100
commit851c4a0b3615234ff3930389dd666205c2863c64 (patch)
treec4836b7236b7ad5f3aaf09a5be5db37b4ab4cc2f /backends/pulse/pulse-stream-control.h
parentc03e76c83ed49335390cdb9e3a8e63df4d73e0c5 (diff)
downloadlibmatemixer-851c4a0b3615234ff3930389dd666205c2863c64.tar.bz2
libmatemixer-851c4a0b3615234ff3930389dd666205c2863c64.tar.xz
pulse: Turn a macro into a function and provide error checking
Diffstat (limited to 'backends/pulse/pulse-stream-control.h')
-rw-r--r--backends/pulse/pulse-stream-control.h32
1 files changed, 15 insertions, 17 deletions
diff --git a/backends/pulse/pulse-stream-control.h b/backends/pulse/pulse-stream-control.h
index ae1bb26..07d297c 100644
--- a/backends/pulse/pulse-stream-control.h
+++ b/backends/pulse/pulse-stream-control.h
@@ -41,9 +41,6 @@ G_BEGIN_DECLS
#define PULSE_STREAM_CONTROL_GET_CLASS(o) \
(G_TYPE_INSTANCE_GET_CLASS ((o), PULSE_TYPE_STREAM_CONTROL, PulseStreamControlClass))
-#define PULSE_STREAM_CONTROL_GET_STREAM_INDEX(psc) \
- (pulse_stream_get_index (PULSE_STREAM (mate_mixer_stream_control_get_stream (MATE_MIXER_STREAM_CONTROL (psc)))))
-
typedef struct _PulseStreamControlClass PulseStreamControlClass;
typedef struct _PulseStreamControlPrivate PulseStreamControlPrivate;
@@ -68,25 +65,26 @@ struct _PulseStreamControlClass
PulseMonitor *(*create_monitor) (PulseStreamControl *control);
};
-GType pulse_stream_control_get_type (void) G_GNUC_CONST;
+GType pulse_stream_control_get_type (void) G_GNUC_CONST;
-guint32 pulse_stream_control_get_index (PulseStreamControl *control);
+guint32 pulse_stream_control_get_index (PulseStreamControl *control);
+guint32 pulse_stream_control_get_stream_index (PulseStreamControl *control);
-PulseConnection * pulse_stream_control_get_connection (PulseStreamControl *control);
-PulseMonitor * pulse_stream_control_get_monitor (PulseStreamControl *control);
+PulseConnection * pulse_stream_control_get_connection (PulseStreamControl *control);
+PulseMonitor * pulse_stream_control_get_monitor (PulseStreamControl *control);
-const pa_cvolume * pulse_stream_control_get_cvolume (PulseStreamControl *control);
-const pa_channel_map *pulse_stream_control_get_channel_map (PulseStreamControl *control);
+const pa_cvolume * pulse_stream_control_get_cvolume (PulseStreamControl *control);
+const pa_channel_map *pulse_stream_control_get_channel_map (PulseStreamControl *control);
-void pulse_stream_control_set_app_info (PulseStreamControl *stream,
- MateMixerAppInfo *info,
- gboolean take);
+void pulse_stream_control_set_app_info (PulseStreamControl *stream,
+ MateMixerAppInfo *info,
+ gboolean take);
-void pulse_stream_control_set_channel_map (PulseStreamControl *control,
- const pa_channel_map *map);
-void pulse_stream_control_set_cvolume (PulseStreamControl *control,
- const pa_cvolume *cvolume,
- pa_volume_t base_volume);
+void pulse_stream_control_set_channel_map (PulseStreamControl *control,
+ const pa_channel_map *map);
+void pulse_stream_control_set_cvolume (PulseStreamControl *control,
+ const pa_cvolume *cvolume,
+ pa_volume_t base_volume);
G_END_DECLS