summaryrefslogtreecommitdiff
path: root/mate-volume-control
diff options
context:
space:
mode:
Diffstat (limited to 'mate-volume-control')
-rw-r--r--mate-volume-control/src/Makefile.am4
-rw-r--r--mate-volume-control/src/gvc-level-bar.c4
-rw-r--r--mate-volume-control/src/gvc-mixer-dialog.c4
-rw-r--r--mate-volume-control/src/gvc-speaker-test.c8
-rw-r--r--mate-volume-control/src/gvc-utils.c (renamed from mate-volume-control/src/mvc-helpers.c)10
-rw-r--r--mate-volume-control/src/gvc-utils.h (renamed from mate-volume-control/src/mvc-helpers.h)14
6 files changed, 22 insertions, 22 deletions
diff --git a/mate-volume-control/src/Makefile.am b/mate-volume-control/src/Makefile.am
index 165b676..38f63ea 100644
--- a/mate-volume-control/src/Makefile.am
+++ b/mate-volume-control/src/Makefile.am
@@ -20,8 +20,8 @@ noinst_LTLIBRARIES = libmatevolumecontrol.la
libmatevolumecontrol_la_SOURCES = \
gvc-channel-bar.h \
gvc-channel-bar.c \
- mvc-helpers.c \
- mvc-helpers.h \
+ gvc-utils.c \
+ gvc-utils.h \
$(NULL)
mate_volume_control_applet_LDADD = \
diff --git a/mate-volume-control/src/gvc-level-bar.c b/mate-volume-control/src/gvc-level-bar.c
index 0f3dc1b..029b346 100644
--- a/mate-volume-control/src/gvc-level-bar.c
+++ b/mate-volume-control/src/gvc-level-bar.c
@@ -28,7 +28,7 @@
#include <gtk/gtk.h>
#include "gvc-level-bar.h"
-#include "mvc-helpers.h"
+#include "gvc-utils.h"
#define GVC_LEVEL_BAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_LEVEL_BAR, GvcLevelBarPrivate))
@@ -185,7 +185,7 @@ bar_calc_layout (GvcLevelBar *bar)
GTK_STATE_FLAG_NORMAL,
&bar->priv->layout.color_dark);
- mvc_color_shade (&bar->priv->layout.color_dark,
+ gvc_color_shade (&bar->priv->layout.color_dark,
&bar->priv->layout.color_dark,
0.7);
#else
diff --git a/mate-volume-control/src/gvc-mixer-dialog.c b/mate-volume-control/src/gvc-mixer-dialog.c
index 26e0540..b6525fb 100644
--- a/mate-volume-control/src/gvc-mixer-dialog.c
+++ b/mate-volume-control/src/gvc-mixer-dialog.c
@@ -36,7 +36,7 @@
#include "gvc-sound-theme-chooser.h"
#include "gvc-level-bar.h"
#include "gvc-speaker-test.h"
-#include "mvc-helpers.h"
+#include "gvc-utils.h"
#define GVC_MIXER_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_MIXER_DIALOG, GvcMixerDialogPrivate))
@@ -1037,7 +1037,7 @@ add_stream (GvcMixerDialog *dialog, MateMixerStream *stream)
control = mate_mixer_stream_get_default_control (stream);
if (G_LIKELY (control != NULL))
- speakers = mvc_channel_map_to_pretty_string (control);
+ speakers = gvc_channel_map_to_pretty_string (control);
}
controls = mate_mixer_stream_list_controls (stream);
diff --git a/mate-volume-control/src/gvc-speaker-test.c b/mate-volume-control/src/gvc-speaker-test.c
index e9f40b0..e638413 100644
--- a/mate-volume-control/src/gvc-speaker-test.c
+++ b/mate-volume-control/src/gvc-speaker-test.c
@@ -30,7 +30,7 @@
#include <libmatemixer/matemixer.h>
#include "gvc-speaker-test.h"
-#include "mvc-helpers.h"
+#include "gvc-utils.h"
#define GVC_SPEAKER_TEST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_SPEAKER_TEST, GvcSpeakerTestPrivate))
@@ -316,10 +316,10 @@ on_test_button_clicked (GtkButton *button, GtkWidget *control)
CA_PROP_MEDIA_ROLE, "test");
ca_proplist_sets (proplist,
CA_PROP_MEDIA_NAME,
- mvc_channel_position_to_pretty_string (position));
+ gvc_channel_position_to_pretty_string (position));
ca_proplist_sets (proplist,
CA_PROP_CANBERRA_FORCE_CHANNEL,
- mvc_channel_position_to_pulse_string (position));
+ gvc_channel_position_to_pulse_string (position));
ca_proplist_sets (proplist, CA_PROP_CANBERRA_ENABLE, "1");
@@ -374,7 +374,7 @@ create_control (ca_context *canberra, MateMixerChannelPosition position)
g_object_set_data (G_OBJECT (control), "image", image);
gtk_box_pack_start (GTK_BOX (control), image, FALSE, FALSE, 0);
- label = gtk_label_new (mvc_channel_position_to_pretty_string (position));
+ label = gtk_label_new (gvc_channel_position_to_pretty_string (position));
gtk_box_pack_start (GTK_BOX (control), label, FALSE, FALSE, 0);
test_button = gtk_button_new_with_label (_("Test"));
diff --git a/mate-volume-control/src/mvc-helpers.c b/mate-volume-control/src/gvc-utils.c
index 4f572fc..d45a217 100644
--- a/mate-volume-control/src/mvc-helpers.c
+++ b/mate-volume-control/src/gvc-utils.c
@@ -26,7 +26,7 @@
#include <libmatemixer/matemixer.h>
-#include "mvc-helpers.h"
+#include "gvc-utils.h"
/* libcanberra requires a PulseAudio channel name to be given to its
* CA_PROP_CANBERRA_FORCE_CHANNEL property.
@@ -80,7 +80,7 @@ static const gchar *pretty_position[MATE_MIXER_CHANNEL_MAX] = {
};
const gchar *
-mvc_channel_position_to_pulse_string (MateMixerChannelPosition position)
+gvc_channel_position_to_pulse_string (MateMixerChannelPosition position)
{
g_return_val_if_fail (position >= 0 && position < MATE_MIXER_CHANNEL_MAX, NULL);
@@ -88,7 +88,7 @@ mvc_channel_position_to_pulse_string (MateMixerChannelPosition position)
}
const gchar *
-mvc_channel_position_to_pretty_string (MateMixerChannelPosition position)
+gvc_channel_position_to_pretty_string (MateMixerChannelPosition position)
{
g_return_val_if_fail (position >= 0 && position < MATE_MIXER_CHANNEL_MAX, NULL);
@@ -96,7 +96,7 @@ mvc_channel_position_to_pretty_string (MateMixerChannelPosition position)
}
const gchar *
-mvc_channel_map_to_pretty_string (MateMixerStreamControl *control)
+gvc_channel_map_to_pretty_string (MateMixerStreamControl *control)
{
g_return_val_if_fail (MATE_MIXER_IS_STREAM_CONTROL (control), NULL);
@@ -163,7 +163,7 @@ static void rgb_to_hls (gdouble *r, gdouble *g, gdouble *b);
static void hls_to_rgb (gdouble *h, gdouble *l, gdouble *s);
void
-mvc_color_shade (GdkRGBA *a, GdkRGBA *b, gdouble k)
+gvc_color_shade (GdkRGBA *a, GdkRGBA *b, gdouble k)
{
gdouble red;
gdouble green;
diff --git a/mate-volume-control/src/mvc-helpers.h b/mate-volume-control/src/gvc-utils.h
index 10d5d65..4eca7a7 100644
--- a/mate-volume-control/src/mvc-helpers.h
+++ b/mate-volume-control/src/gvc-utils.h
@@ -18,8 +18,8 @@
*
*/
-#ifndef __MVC_HELPERS_H
-#define __MVC_HELPERS_H
+#ifndef __GVC_HELPERS_H
+#define __GVC_HELPERS_H
#include <glib.h>
@@ -27,16 +27,16 @@
G_BEGIN_DECLS
-const gchar *mvc_channel_position_to_pulse_string (MateMixerChannelPosition position);
-const gchar *mvc_channel_position_to_pretty_string (MateMixerChannelPosition position);
-const gchar *mvc_channel_map_to_pretty_string (MateMixerStreamControl *control);
+const gchar *gvc_channel_position_to_pulse_string (MateMixerChannelPosition position);
+const gchar *gvc_channel_position_to_pretty_string (MateMixerChannelPosition position);
+const gchar *gvc_channel_map_to_pretty_string (MateMixerStreamControl *control);
#if GTK_CHECK_VERSION (3, 0, 0)
-void mvc_color_shade (GdkRGBA *a,
+void gvc_color_shade (GdkRGBA *a,
GdkRGBA *b,
gdouble k);
#endif
G_END_DECLS
-#endif /* __MVC_HELPERS_H */
+#endif /* __GVC_HELPERS_H */
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 13:48:04 +0000