diff options
author | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2015-09-09 14:51:47 +0300 |
---|---|---|
committer | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2015-09-15 15:35:26 +0300 |
commit | 84819a350d4f550979f1dcf4c62767419dc21180 (patch) | |
tree | 93a3c1d1418bfe009f560262ad7d74517c61e7f7 | |
parent | b7bce3294492bbeb453bb56110b9ef8583ac4512 (diff) | |
download | libgnome-volume-control-84819a350d4f550979f1dcf4c62767419dc21180.tar.gz |
gvc-mixer-stream: make card-index unsigned int
Card in pa_source_info that is used as card-index is uint32_t so it
is never less then 0. Also index in GvcMixerCard is already unsigned
int that is used to compare with card-index. This fixes build
warning - comparison between signed and unsigned integer expressions.
https://bugzilla.gnome.org/show_bug.cgi?id=752244
-rw-r--r-- | gvc-mixer-stream.c | 6 | ||||
-rw-r--r-- | gvc-mixer-stream.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gvc-mixer-stream.c b/gvc-mixer-stream.c index e2209a1..afe4d31 100644 --- a/gvc-mixer-stream.c +++ b/gvc-mixer-stream.c @@ -42,7 +42,7 @@ struct GvcMixerStreamPrivate pa_context *pa_context; guint id; guint index; - gint card_index; + guint card_index; GvcChannelMap *channel_map; char *name; char *description; @@ -609,7 +609,7 @@ gvc_mixer_stream_set_ports (GvcMixerStream *stream, return TRUE; } -gint +guint gvc_mixer_stream_get_card_index (GvcMixerStream *stream) { g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), PA_INVALID_INDEX); @@ -618,7 +618,7 @@ gvc_mixer_stream_get_card_index (GvcMixerStream *stream) gboolean gvc_mixer_stream_set_card_index (GvcMixerStream *stream, - gint card_index) + guint card_index) { g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), FALSE); diff --git a/gvc-mixer-stream.h b/gvc-mixer-stream.h index fefb1c8..76cfb43 100644 --- a/gvc-mixer-stream.h +++ b/gvc-mixer-stream.h @@ -94,7 +94,7 @@ const char * gvc_mixer_stream_get_description (GvcMixerStream *stream); const char * gvc_mixer_stream_get_application_id (GvcMixerStream *stream); gboolean gvc_mixer_stream_is_event_stream (GvcMixerStream *stream); gboolean gvc_mixer_stream_is_virtual (GvcMixerStream *stream); -gint gvc_mixer_stream_get_card_index (GvcMixerStream *stream); +guint gvc_mixer_stream_get_card_index (GvcMixerStream *stream); /* private */ gboolean gvc_mixer_stream_set_volume (GvcMixerStream *stream, @@ -128,7 +128,7 @@ gboolean gvc_mixer_stream_set_port (GvcMixerStream *stream, gboolean gvc_mixer_stream_set_ports (GvcMixerStream *stream, GList *ports); gboolean gvc_mixer_stream_set_card_index (GvcMixerStream *stream, - gint card_index); + guint card_index); G_END_DECLS |