More porting work along with fixes and cleanups

1 files changed, 61 insertions, 38 deletions

diff --git a/mate-volume-control/src/gvc-channel-bar.h b/mate-volume-control/src/gvc-channel-bar.h
index d31da50..16d6257 100644
--- a/mate-volume-control/src/gvc-channel-bar.h
+++ b/mate-volume-control/src/gvc-channel-bar.h
@@ -1,6 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
  *
  * Copyright (C) 2008 Red Hat, Inc.
+ * Copyright (C) 2014 Michal Ratajsky <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +24,9 @@
 
 #include <glib.h>
 #include <glib-object.h>
+#include <gtk/gtk.h>
+
+#include <libmatemixer/matemixer.h>
 
 G_BEGIN_DECLS
 
@@ -33,9 +37,11 @@ G_BEGIN_DECLS
 #define GVC_IS_CHANNEL_BAR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GVC_TYPE_CHANNEL_BAR))
 #define GVC_CHANNEL_BAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GVC_TYPE_CHANNEL_BAR, GvcChannelBarClass))
 
-typedef struct GvcChannelBarPrivate GvcChannelBarPrivate;
+typedef struct _GvcChannelBar         GvcChannelBar;
+typedef struct _GvcChannelBarClass    GvcChannelBarClass;
+typedef struct _GvcChannelBarPrivate  GvcChannelBarPrivate;
 
-typedef struct
+struct _GvcChannelBar
 {
 #if GTK_CHECK_VERSION (3, 0, 0)
         GtkBox                parent;
@@ -43,52 +49,69 @@ typedef struct
         GtkHBox               parent;
 #endif
         GvcChannelBarPrivate *priv;
-} GvcChannelBar;
+};
 
-typedef struct
+struct _GvcChannelBarClass
 {
 #if GTK_CHECK_VERSION (3, 0, 0)
         GtkBoxClass           parent_class;
 #else
         GtkHBoxClass          parent_class;
 #endif
-} GvcChannelBarClass;
+
+        void (* changed) (GvcChannelBar *bar);
+};
 
 GType               gvc_channel_bar_get_type            (void);
 
-GtkWidget *         gvc_channel_bar_new                 (void);
-
-void                gvc_channel_bar_set_name            (GvcChannelBar *bar,
-                                                         const char    *name);
-void                gvc_channel_bar_set_icon_name       (GvcChannelBar *bar,
-                                                         const char    *icon_name);
-void                gvc_channel_bar_set_low_icon_name   (GvcChannelBar *bar,
-                                                         const char    *icon_name);
-void                gvc_channel_bar_set_high_icon_name  (GvcChannelBar *bar,
-                                                         const char    *icon_name);
-
-void                gvc_channel_bar_set_orientation     (GvcChannelBar *bar,
-                                                         GtkOrientation orientation);
-GtkOrientation      gvc_channel_bar_get_orientation     (GvcChannelBar *bar);
-
-GtkAdjustment *     gvc_channel_bar_get_adjustment      (GvcChannelBar *bar);
-
-gboolean            gvc_channel_bar_get_is_muted        (GvcChannelBar *bar);
-void                gvc_channel_bar_set_is_muted        (GvcChannelBar *bar,
-                                                         gboolean       is_muted);
-gboolean            gvc_channel_bar_get_show_mute       (GvcChannelBar *bar);
-void                gvc_channel_bar_set_show_mute       (GvcChannelBar *bar,
-                                                         gboolean       show_mute);
-void                gvc_channel_bar_set_size_group      (GvcChannelBar *bar,
-                                                         GtkSizeGroup  *group,
-                                                         gboolean       symmetric);
-void                gvc_channel_bar_set_is_amplified    (GvcChannelBar *bar,
-                                                         gboolean amplified);
-void                gvc_channel_bar_set_base_volume     (GvcChannelBar *bar,
-                                                         guint32        base_volume);
-
-gboolean            gvc_channel_bar_scroll              (GvcChannelBar *bar,
-                                                         GdkScrollDirection direction);
+GtkWidget *         gvc_channel_bar_new                 (MateMixerStream    *stream);
+
+MateMixerStream *   gvc_channel_bar_get_stream          (GvcChannelBar      *bar);
+void                gvc_channel_bar_set_stream          (GvcChannelBar      *bar,
+                                                         MateMixerStream    *stream);
+
+const gchar *       gvc_channel_bar_get_name            (GvcChannelBar      *bar);
+void                gvc_channel_bar_set_name            (GvcChannelBar      *bar,
+                                                         const gchar        *name);
+
+const gchar *       gvc_channel_bar_get_icon_name       (GvcChannelBar      *bar);
+void                gvc_channel_bar_set_icon_name       (GvcChannelBar      *bar,
+                                                         const gchar        *icon_name);
+
+const gchar *       gvc_channel_bar_get_low_icon_name   (GvcChannelBar      *bar);
+void                gvc_channel_bar_set_low_icon_name   (GvcChannelBar      *bar,
+                                                         const gchar        *icon_name);
+
+const gchar *       gvc_channel_bar_get_high_icon_name  (GvcChannelBar      *bar);
+void                gvc_channel_bar_set_high_icon_name  (GvcChannelBar      *bar,
+                                                         const gchar        *icon_name);
+
+GtkOrientation      gvc_channel_bar_get_orientation     (GvcChannelBar      *bar);
+void                gvc_channel_bar_set_orientation     (GvcChannelBar      *bar,
+                                                         GtkOrientation      orientation);
+
+gboolean            gvc_channel_bar_get_show_icons      (GvcChannelBar      *bar);
+void                gvc_channel_bar_set_show_icons      (GvcChannelBar      *bar,
+                                                         gboolean            show_mute);
+
+gboolean            gvc_channel_bar_get_show_mute       (GvcChannelBar      *bar);
+void                gvc_channel_bar_set_show_mute       (GvcChannelBar      *bar,
+                                                         gboolean            show_mute);
+
+gboolean            gvc_channel_bar_get_show_marks      (GvcChannelBar      *bar);
+void                gvc_channel_bar_set_show_marks      (GvcChannelBar      *bar,
+                                                         gboolean            show_marks);
+
+gboolean            gvc_channel_bar_get_extended        (GvcChannelBar      *bar);
+void                gvc_channel_bar_set_extended        (GvcChannelBar      *bar,
+                                                         gboolean            extended);
+
+void                gvc_channel_bar_set_size_group      (GvcChannelBar      *bar,
+                                                         GtkSizeGroup       *group,
+                                                         gboolean            symmetric);
+
+gboolean            gvc_channel_bar_scroll              (GvcChannelBar      *bar,
+                                                         GdkScrollDirection  direction);
 
 G_END_DECLS