Merge branch 'michal-wip'

1 files changed, 0 insertions, 339 deletions

diff --git a/mate-volume-control/src/mvc-helpers.c b/mate-volume-control/src/mvc-helpers.c
deleted file mode 100644
index 7488743..0000000
--- a/mate-volume-control/src/mvc-helpers.c
+++ /dev/null
@@ -1,339 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * 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.
- *
- */
-
-#include "config.h"
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#include <libmatemixer/matemixer.h>
-
-#ifdef HAVE_PULSEAUDIO
-#include <pulse/pulseaudio.h>
-#endif
-
-#include "mvc-helpers.h"
-
-#ifdef HAVE_PULSEAUDIO
-static pa_channel_position_t
-position_to_pulse (MateMixerChannelPosition position)
-{
-        switch (position) {
-        case MATE_MIXER_CHANNEL_MONO:
-                return PA_CHANNEL_POSITION_MONO;
-        case MATE_MIXER_CHANNEL_FRONT_LEFT:
-                return PA_CHANNEL_POSITION_FRONT_LEFT;
-        case MATE_MIXER_CHANNEL_FRONT_RIGHT:
-                return PA_CHANNEL_POSITION_FRONT_RIGHT;
-        case MATE_MIXER_CHANNEL_FRONT_CENTER:
-                return PA_CHANNEL_POSITION_FRONT_CENTER;
-        case MATE_MIXER_CHANNEL_LFE:
-                return PA_CHANNEL_POSITION_LFE;
-        case MATE_MIXER_CHANNEL_BACK_LEFT:
-                return PA_CHANNEL_POSITION_REAR_LEFT;
-        case MATE_MIXER_CHANNEL_BACK_RIGHT:
-                return PA_CHANNEL_POSITION_REAR_RIGHT;
-        case MATE_MIXER_CHANNEL_BACK_CENTER:
-                return PA_CHANNEL_POSITION_REAR_CENTER;
-        case MATE_MIXER_CHANNEL_FRONT_LEFT_CENTER:
-                return PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER;
-        case MATE_MIXER_CHANNEL_FRONT_RIGHT_CENTER:
-                return PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER;
-        case MATE_MIXER_CHANNEL_SIDE_LEFT:
-                return PA_CHANNEL_POSITION_SIDE_LEFT;
-        case MATE_MIXER_CHANNEL_SIDE_RIGHT:
-                return PA_CHANNEL_POSITION_SIDE_RIGHT;
-        case MATE_MIXER_CHANNEL_TOP_FRONT_LEFT:
-                return PA_CHANNEL_POSITION_TOP_FRONT_LEFT;
-        case MATE_MIXER_CHANNEL_TOP_FRONT_RIGHT:
-                return PA_CHANNEL_POSITION_TOP_FRONT_RIGHT;
-        case MATE_MIXER_CHANNEL_TOP_FRONT_CENTER:
-                return PA_CHANNEL_POSITION_TOP_FRONT_CENTER;
-        case MATE_MIXER_CHANNEL_TOP_CENTER:
-                return PA_CHANNEL_POSITION_TOP_CENTER;
-        case MATE_MIXER_CHANNEL_TOP_BACK_LEFT:
-                return PA_CHANNEL_POSITION_TOP_REAR_LEFT;
-        case MATE_MIXER_CHANNEL_TOP_BACK_RIGHT:
-                return PA_CHANNEL_POSITION_TOP_REAR_RIGHT;
-        case MATE_MIXER_CHANNEL_TOP_BACK_CENTER:
-                return PA_CHANNEL_POSITION_TOP_REAR_CENTER;
-        default:
-                return PA_CHANNEL_POSITION_INVALID;
-        }
-}
-#endif
-
-const gchar *
-mvc_channel_position_to_string (MateMixerChannelPosition position)
-{
-#ifdef HAVE_PULSEAUDIO
-        return pa_channel_position_to_string (position_to_pulse (position));
-#endif
-        return NULL;
-}
-
-const gchar *
-mvc_channel_position_to_pretty_string (MateMixerChannelPosition position)
-{
-#ifdef HAVE_PULSEAUDIO
-        return pa_channel_position_to_pretty_string (position_to_pulse (position));
-#endif
-        return NULL;
-}
-
-const gchar *
-mvc_channel_map_to_pretty_string (MateMixerStreamControl *control)
-{
-        g_return_val_if_fail (MATE_MIXER_IS_STREAM_CONTROL (control), NULL);
-
-#define HAS_POSITION(p) (mate_mixer_stream_control_has_channel_position (control, (p)))
-
-        /* Modeled after PulseAudio 5.0, probably could be extended with other combinations */
-        switch (mate_mixer_stream_control_get_num_channels (control)) {
-        case 1:
-                if (HAS_POSITION (MATE_MIXER_CHANNEL_MONO))
-                        return _("Mono");
-                break;
-        case 2:
-                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT))
-                        return _("Stereo");
-                break;
-        case 4:
-                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_RIGHT))
-                        return _("Surround 4.0");
-                break;
-        case 5:
-                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_RIGHT))
-                        if (HAS_POSITION (MATE_MIXER_CHANNEL_LFE))
-                                return _("Surround 4.1");
-                        if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_CENTER))
-                                return _("Surround 5.0");
-                break;
-        case 6:
-                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_CENTER) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_RIGHT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_LFE))
-                        return _("Surround 5.1");
-                break;
-        case 8:
-                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_CENTER) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_RIGHT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_SIDE_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_SIDE_RIGHT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_LFE))
-                        return _("Surround 7.1");
-                break;
-        }
-
-#undef HAS_POSITION
-
-        return NULL;
-}
-
-#if GTK_CHECK_VERSION (3, 0, 0)
-/* Taken from gtkstyle.c */
-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)
-{
-        gdouble red;
-        gdouble green;
-        gdouble blue;
-
-        red = (gdouble) a->red / 65535.0;
-        green = (gdouble) a->green / 65535.0;
-        blue = (gdouble) a->blue / 65535.0;
-
-        rgb_to_hls (&red, &green, &blue);
-
-        green *= k;
-        if (green > 1.0)
-                green = 1.0;
-        else if (green < 0.0)
-                green = 0.0;
-
-        blue *= k;
-        if (blue > 1.0)
-                blue = 1.0;
-        else if (blue < 0.0)
-                blue = 0.0;
-
-        hls_to_rgb (&red, &green, &blue);
-
-        b->red = red * 65535.0;
-        b->green = green * 65535.0;
-        b->blue = blue * 65535.0;
-}
-
-static void
-rgb_to_hls (gdouble *r, gdouble *g, gdouble *b)
-{
-        gdouble min;
-        gdouble max;
-        gdouble red;
-        gdouble green;
-        gdouble blue;
-        gdouble h, l, s;
-        gdouble delta;
-
-        red = *r;
-        green = *g;
-        blue = *b;
-
-        if (red > green) {
-                if (red > blue)
-                        max = red;
-                else
-                        max = blue;
-
-                if (green < blue)
-                        min = green;
-                else
-                        min = blue;
-        } else {
-                if (green > blue)
-                        max = green;
-                else
-                        max = blue;
-
-                if (red < blue)
-                        min = red;
-                else
-                        min = blue;
-        }
-
-        l = (max + min) / 2;
-        s = 0;
-        h = 0;
-
-        if (max != min) {
-                if (l <= 0.5)
-                        s = (max - min) / (max + min);
-                else
-                        s = (max - min) / (2 - max - min);
-
-                delta = max - min;
-                if (red == max)
-                        h = (green - blue) / delta;
-                else if (green == max)
-                        h = 2 + (blue - red) / delta;
-                else if (blue == max)
-                        h = 4 + (red - green) / delta;
-
-                h *= 60;
-                if (h < 0.0)
-                        h += 360;
-        }
-
-        *r = h;
-        *g = l;
-        *b = s;
-}
-
-static void
-hls_to_rgb (gdouble *h, gdouble *l, gdouble *s)
-{
-        gdouble hue;
-        gdouble lightness;
-        gdouble saturation;
-        gdouble m1, m2;
-        gdouble r, g, b;
-
-        lightness = *l;
-        saturation = *s;
-
-        if (lightness <= 0.5)
-                m2 = lightness * (1 + saturation);
-        else
-                m2 = lightness + saturation - lightness * saturation;
-        m1 = 2 * lightness - m2;
-
-        if (saturation == 0) {
-                *h = lightness;
-                *l = lightness;
-                *s = lightness;
-        } else {
-                hue = *h + 120;
-                while (hue > 360)
-                        hue -= 360;
-                while (hue < 0)
-                        hue += 360;
-
-                if (hue < 60)
-                        r = m1 + (m2 - m1) * hue / 60;
-                else if (hue < 180)
-                        r = m2;
-                else if (hue < 240)
-                        r = m1 + (m2 - m1) * (240 - hue) / 60;
-                else
-                        r = m1;
-
-                hue = *h;
-                while (hue > 360)
-                        hue -= 360;
-                while (hue < 0)
-                        hue += 360;
-
-                if (hue < 60)
-                        g = m1 + (m2 - m1) * hue / 60;
-                else if (hue < 180)
-                        g = m2;
-                else if (hue < 240)
-                        g = m1 + (m2 - m1) * (240 - hue) / 60;
-                else
-                        g = m1;
-
-                hue = *h - 120;
-                while (hue > 360)
-                        hue -= 360;
-                while (hue < 0)
-                        hue += 360;
-
-                if (hue < 60)
-                        b = m1 + (m2 - m1) * hue / 60;
-                else if (hue < 180)
-                        b = m2;
-                else if (hue < 240)
-                        b = m1 + (m2 - m1) * (240 - hue) / 60;
-                else
-                        b = m1;
-
-                *h = r;
-                *l = g;
-                *s = b;
-        }
-}
-#endif