Merge branch 'michal-wip'

1 files changed, 0 insertions, 82 deletions

diff --git a/mate-volume-control/src/gvc-balance-bar.h b/mate-volume-control/src/gvc-balance-bar.h
deleted file mode 100644
index d5b142d..0000000
--- a/mate-volume-control/src/gvc-balance-bar.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef __GVC_BALANCE_BAR_H
-#define __GVC_BALANCE_BAR_H
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
-#include <libmatemixer/matemixer.h>
-
-G_BEGIN_DECLS
-
-#define GVC_TYPE_BALANCE_BAR         (gvc_balance_bar_get_type ())
-#define GVC_BALANCE_BAR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GVC_TYPE_BALANCE_BAR, GvcBalanceBar))
-#define GVC_BALANCE_BAR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GVC_TYPE_BALANCE_BAR, GvcBalanceBarClass))
-#define GVC_IS_BALANCE_BAR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GVC_TYPE_BALANCE_BAR))
-#define GVC_IS_BALANCE_BAR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GVC_TYPE_BALANCE_BAR))
-#define GVC_BALANCE_BAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GVC_TYPE_BALANCE_BAR, GvcBalanceBarClass))
-
-typedef enum {
-        BALANCE_TYPE_RL,
-        BALANCE_TYPE_FR,
-        BALANCE_TYPE_LFE,
-} GvcBalanceType;
-
-#define NUM_BALANCE_TYPES BALANCE_TYPE_LFE + 1
-
-typedef struct _GvcBalanceBar         GvcBalanceBar;
-typedef struct _GvcBalanceBarClass    GvcBalanceBarClass;
-typedef struct _GvcBalanceBarPrivate  GvcBalanceBarPrivate;
-
-struct _GvcBalanceBar
-{
-#if GTK_CHECK_VERSION (3, 0, 0)
-        GtkBox                parent;
-#else
-        GtkHBox               parent;
-#endif
-        GvcBalanceBarPrivate *priv;
-};
-
-struct _GvcBalanceBarClass
-{
-#if GTK_CHECK_VERSION (3, 0, 0)
-        GtkBoxClass           parent_class;
-#else
-        GtkHBoxClass          parent_class;
-#endif
-};
-
-GType               gvc_balance_bar_get_type            (void) G_GNUC_CONST;
-
-GtkWidget *         gvc_balance_bar_new                 (MateMixerStreamControl *control,
-                                                         GvcBalanceType   btype);
-
-void                gvc_balance_bar_set_size_group      (GvcBalanceBar   *bar,
-                                                         GtkSizeGroup    *group,
-                                                         gboolean         symmetric);
-
-G_END_DECLS
-
-#endif /* __GVC_BALANCE_BAR_H */