b542e98359
The current code does not differenciate between input and output, and thus it shows the same icon for muting outputs and inputs. As per design suggesion [1], the input row should use the "microphone-sensitivity-muted-symbolic" icon. In order to achieve that, move the CcLevelBarStreamType enum to a separate header, and rename it to CcStreamType. And also pass the stream type to the volume slider. In CcVolumeSlider, update the code to switch to the correct mute icon depending on the stream type. [1] https://gitlab.gnome.org/GNOME/gnome-control-center/issues/539 Fixes https://gitlab.gnome.org/GNOME/gnome-control-center/issues/539
131 lines
4.1 KiB
C
131 lines
4.1 KiB
C
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
|
|
*
|
|
* Copyright (C) 2018 Canonical Ltd.
|
|
*
|
|
* 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
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "cc-sound-resources.h"
|
|
#include "cc-stream-row.h"
|
|
#include "cc-volume-slider.h"
|
|
#include "cc-sound-enums.h"
|
|
|
|
#define SPEECH_DISPATCHER_PREFIX "speech-dispatcher-"
|
|
|
|
struct _CcStreamRow
|
|
{
|
|
GtkListBoxRow parent_instance;
|
|
|
|
GtkBox *label_box;
|
|
GtkLabel *name_label;
|
|
GtkImage *icon_image;
|
|
CcVolumeSlider *volume_slider;
|
|
|
|
GvcMixerStream *stream;
|
|
guint id;
|
|
};
|
|
|
|
G_DEFINE_TYPE (CcStreamRow, cc_stream_row, GTK_TYPE_LIST_BOX_ROW)
|
|
|
|
static void
|
|
cc_stream_row_dispose (GObject *object)
|
|
{
|
|
CcStreamRow *self = CC_STREAM_ROW (object);
|
|
|
|
g_clear_object (&self->stream);
|
|
|
|
G_OBJECT_CLASS (cc_stream_row_parent_class)->dispose (object);
|
|
}
|
|
|
|
void
|
|
cc_stream_row_class_init (CcStreamRowClass *klass)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
|
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
|
|
|
|
object_class->dispose = cc_stream_row_dispose;
|
|
|
|
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound/cc-stream-row.ui");
|
|
|
|
gtk_widget_class_bind_template_child (widget_class, CcStreamRow, label_box);
|
|
gtk_widget_class_bind_template_child (widget_class, CcStreamRow, icon_image);
|
|
gtk_widget_class_bind_template_child (widget_class, CcStreamRow, name_label);
|
|
gtk_widget_class_bind_template_child (widget_class, CcStreamRow, volume_slider);
|
|
}
|
|
|
|
void
|
|
cc_stream_row_init (CcStreamRow *self)
|
|
{
|
|
g_resources_register (cc_sound_get_resource ());
|
|
|
|
gtk_widget_init_template (GTK_WIDGET (self));
|
|
}
|
|
|
|
CcStreamRow *
|
|
cc_stream_row_new (GtkSizeGroup *size_group,
|
|
GvcMixerStream *stream,
|
|
guint id,
|
|
CcStreamType stream_type)
|
|
{
|
|
CcStreamRow *self;
|
|
g_autoptr(GtkIconInfo) icon_info = NULL;
|
|
g_autoptr(GIcon) gicon = NULL;
|
|
const gchar *stream_name;
|
|
const gchar *icon_name;
|
|
|
|
self = g_object_new (CC_TYPE_STREAM_ROW, NULL);
|
|
self->stream = g_object_ref (stream);
|
|
self->id = id;
|
|
|
|
icon_name = gvc_mixer_stream_get_icon_name (stream);
|
|
stream_name = gvc_mixer_stream_get_name (stream);
|
|
|
|
/* Explicitly lookup for the icon, since some streams may give us an
|
|
* icon name (e.g. "audio") that doesn't really exist in the theme.
|
|
*/
|
|
icon_info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (),
|
|
icon_name,
|
|
24,
|
|
GTK_ICON_LOOKUP_GENERIC_FALLBACK);
|
|
|
|
if (icon_info)
|
|
gicon = g_themed_icon_new_with_default_fallbacks (icon_name);
|
|
else if (g_str_has_prefix (stream_name, SPEECH_DISPATCHER_PREFIX))
|
|
gicon = g_themed_icon_new_with_default_fallbacks ("preferences-desktop-accessibility-symbolic");
|
|
else
|
|
gicon = g_themed_icon_new_with_default_fallbacks ("application-x-executable-symbolic");
|
|
|
|
gtk_image_set_from_gicon (self->icon_image, gicon, GTK_ICON_SIZE_LARGE_TOOLBAR);
|
|
|
|
gtk_label_set_label (self->name_label, gvc_mixer_stream_get_name (stream));
|
|
cc_volume_slider_set_stream (self->volume_slider, stream, stream_type);
|
|
|
|
gtk_size_group_add_widget (size_group, GTK_WIDGET (self->label_box));
|
|
|
|
return self;
|
|
}
|
|
|
|
GvcMixerStream *
|
|
cc_stream_row_get_stream (CcStreamRow *self)
|
|
{
|
|
g_return_val_if_fail (CC_IS_STREAM_ROW (self), NULL);
|
|
return self->stream;
|
|
}
|
|
|
|
guint
|
|
cc_stream_row_get_id (CcStreamRow *self)
|
|
{
|
|
g_return_val_if_fail (CC_IS_STREAM_ROW (self), 0);
|
|
return self->id;
|
|
}
|