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
This commit is contained in:
Alberts Muktupāvels 2015-09-09 14:51:47 +03:00
parent b7bce32944
commit 84819a350d
2 changed files with 5 additions and 5 deletions

View File

@ -42,7 +42,7 @@ struct GvcMixerStreamPrivate
pa_context *pa_context; pa_context *pa_context;
guint id; guint id;
guint index; guint index;
gint card_index; guint card_index;
GvcChannelMap *channel_map; GvcChannelMap *channel_map;
char *name; char *name;
char *description; char *description;
@ -609,7 +609,7 @@ gvc_mixer_stream_set_ports (GvcMixerStream *stream,
return TRUE; return TRUE;
} }
gint guint
gvc_mixer_stream_get_card_index (GvcMixerStream *stream) gvc_mixer_stream_get_card_index (GvcMixerStream *stream)
{ {
g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), PA_INVALID_INDEX); 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 gboolean
gvc_mixer_stream_set_card_index (GvcMixerStream *stream, 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); g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), FALSE);

View File

@ -94,7 +94,7 @@ const char * gvc_mixer_stream_get_description (GvcMixerStream *stream);
const char * gvc_mixer_stream_get_application_id (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_event_stream (GvcMixerStream *stream);
gboolean gvc_mixer_stream_is_virtual (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 */ /* private */
gboolean gvc_mixer_stream_set_volume (GvcMixerStream *stream, 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, gboolean gvc_mixer_stream_set_ports (GvcMixerStream *stream,
GList *ports); GList *ports);
gboolean gvc_mixer_stream_set_card_index (GvcMixerStream *stream, gboolean gvc_mixer_stream_set_card_index (GvcMixerStream *stream,
gint card_index); guint card_index);
G_END_DECLS G_END_DECLS