[gnome-media] use a single type (pa_volume_t) for all volumes
- From: Lennart Poettering <lpoetter src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-media] use a single type (pa_volume_t) for all volumes
- Date: Fri, 15 May 2009 08:26:19 -0400 (EDT)
commit 76d9f27c232879698bd24b5b855be403f46594ce
Author: Lennart Poettering <lennart poettering net>
Date: Fri May 15 02:03:07 2009 +0200
use a single type (pa_volume_t) for all volumes
---
gnome-volume-control/src/gvc-channel-bar.c | 2 +-
gnome-volume-control/src/gvc-mixer-stream.c | 8 ++++----
gnome-volume-control/src/gvc-mixer-stream.h | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/gnome-volume-control/src/gvc-channel-bar.c b/gnome-volume-control/src/gvc-channel-bar.c
index 39aa656..0a04534 100644
--- a/gnome-volume-control/src/gvc-channel-bar.c
+++ b/gnome-volume-control/src/gvc-channel-bar.c
@@ -603,7 +603,7 @@ gvc_channel_bar_set_is_amplified (GvcChannelBar *bar, gboolean amplified)
void
gvc_channel_bar_set_base_volume (GvcChannelBar *bar,
- guint32 base_volume)
+ pa_volume_t base_volume)
{
g_return_if_fail (GVC_IS_CHANNEL_BAR (bar));
diff --git a/gnome-volume-control/src/gvc-mixer-stream.c b/gnome-volume-control/src/gvc-mixer-stream.c
index c1d4679..7efee99 100644
--- a/gnome-volume-control/src/gvc-mixer-stream.c
+++ b/gnome-volume-control/src/gvc-mixer-stream.c
@@ -48,7 +48,7 @@ struct GvcMixerStreamPrivate
gboolean is_muted;
gboolean can_decibel;
gboolean is_event_stream;
- guint32 base_volume;
+ pa_volume_t base_volume;
};
enum
@@ -117,7 +117,7 @@ gvc_mixer_stream_get_channel_map (GvcMixerStream *stream)
return stream->priv->channel_map;
}
-guint
+pa_volume_t
gvc_mixer_stream_get_volume (GvcMixerStream *stream)
{
g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), 0);
@@ -354,7 +354,7 @@ gvc_mixer_stream_set_icon_name (GvcMixerStream *stream,
return TRUE;
}
-guint32
+pa_volume_t
gvc_mixer_stream_get_base_volume (GvcMixerStream *stream)
{
g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), 0);
@@ -364,7 +364,7 @@ gvc_mixer_stream_get_base_volume (GvcMixerStream *stream)
gboolean
gvc_mixer_stream_set_base_volume (GvcMixerStream *stream,
- guint32 base_volume)
+ pa_volume_t base_volume)
{
g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), FALSE);
diff --git a/gnome-volume-control/src/gvc-mixer-stream.h b/gnome-volume-control/src/gvc-mixer-stream.h
index 58e4865..fe33bb6 100644
--- a/gnome-volume-control/src/gvc-mixer-stream.h
+++ b/gnome-volume-control/src/gvc-mixer-stream.h
@@ -61,7 +61,7 @@ guint gvc_mixer_stream_get_index (GvcMixerStream *stream);
guint gvc_mixer_stream_get_id (GvcMixerStream *stream);
GvcChannelMap * gvc_mixer_stream_get_channel_map (GvcMixerStream *stream);
-guint gvc_mixer_stream_get_volume (GvcMixerStream *stream);
+pa_volume_t gvc_mixer_stream_get_volume (GvcMixerStream *stream);
gdouble gvc_mixer_stream_get_decibel (GvcMixerStream *stream);
gboolean gvc_mixer_stream_push_volume (GvcMixerStream *stream);
pa_volume_t gvc_mixer_stream_get_base_volume (GvcMixerStream *stream);
@@ -79,7 +79,7 @@ gboolean gvc_mixer_stream_is_event_stream (GvcMixerStream *stream);
/* private */
gboolean gvc_mixer_stream_set_volume (GvcMixerStream *stream,
- guint volume);
+ pa_volume_t volume);
gboolean gvc_mixer_stream_set_decibel (GvcMixerStream *stream,
gdouble db);
gboolean gvc_mixer_stream_set_is_muted (GvcMixerStream *stream,
@@ -97,7 +97,7 @@ gboolean gvc_mixer_stream_set_is_event_stream (GvcMixerStream *stream
gboolean gvc_mixer_stream_set_application_id (GvcMixerStream *stream,
const char *application_id);
gboolean gvc_mixer_stream_set_base_volume (GvcMixerStream *stream,
- guint32 base_volume);
+ pa_volume_t base_volume);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]