diff options
| author | Michal Ratajsky <[email protected]> | 2014-08-20 22:59:43 +0200 |
|---|---|---|
| committer | Michal Ratajsky <[email protected]> | 2014-08-20 22:59:43 +0200 |
| commit | 3a99c51bb0bcba28d0d38bbed937c2071d9666b2 (patch) | |
| tree | 62cec902054a0087461ffcdb69bbef1f1f991c22 | |
| parent | 4a2da6bcb81e407dbaa40d053cdda2e03a696c68 (diff) | |
| download | libmatemixer-3a99c51bb0bcba28d0d38bbed937c2071d9666b2.tar.bz2 libmatemixer-3a99c51bb0bcba28d0d38bbed937c2071d9666b2.tar.xz | |
Fix a typo and some compiler warnings
| -rw-r--r-- | backends/pulse/pulse-backend.c | 3 | ||||
| -rw-r--r-- | backends/pulse/pulse-stream.c | 5 | ||||
| -rw-r--r-- | libmatemixer/matemixer-stream-control.c | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/backends/pulse/pulse-backend.c b/backends/pulse/pulse-backend.c index 1a1cabc..0d9c39c 100644 --- a/backends/pulse/pulse-backend.c +++ b/backends/pulse/pulse-backend.c @@ -99,8 +99,7 @@ struct _PulseBackendPrivate NULL)) #define PULSE_GET_HANGING(o) \ - ((gboolean) g_object_get_data (G_OBJECT (o), \ - "__matemixer_pulse_hanging")) + ((gboolean) GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (o), "__matemixer_pulse_hanging"))) #define PULSE_SET_HANGING(o) \ (g_object_set_data (G_OBJECT (o), \ diff --git a/backends/pulse/pulse-stream.c b/backends/pulse/pulse-stream.c index 752c3e6..9856c98 100644 --- a/backends/pulse/pulse-stream.c +++ b/backends/pulse/pulse-stream.c @@ -63,16 +63,13 @@ G_DEFINE_ABSTRACT_TYPE (PulseStream, pulse_stream, MATE_MIXER_TYPE_STREAM) static void pulse_stream_class_init (PulseStreamClass *klass) { - GObjectClass *object_class; - MateMixerStreamClass *stream_class; + GObjectClass *object_class; object_class = G_OBJECT_CLASS (klass); object_class->dispose = pulse_stream_dispose; object_class->get_property = pulse_stream_get_property; object_class->set_property = pulse_stream_set_property; - stream_class = MATE_MIXER_STREAM_CLASS (klass); - properties[PROP_INDEX] = g_param_spec_uint ("index", "Index", diff --git a/libmatemixer/matemixer-stream-control.c b/libmatemixer/matemixer-stream-control.c index ef0f906..161396e 100644 --- a/libmatemixer/matemixer-stream-control.c +++ b/libmatemixer/matemixer-stream-control.c @@ -774,7 +774,7 @@ mate_mixer_stream_control_set_fade (MateMixerStreamControl *control, gfloat fade klass->set_fade (control, fade) == FALSE) return FALSE; - _mate_mixer_stream_control_set_fade (control, balance); + _mate_mixer_stream_control_set_fade (control, fade); return TRUE; } return FALSE; |