summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2019-04-21 02:57:02 +0200
committerlukefromdc <[email protected]>2019-04-22 06:52:35 +0000
commit53788ae7006f4aa251104b81d2265d5bb5c80522 (patch)
tree2d763e2c439ac0755118ea36e21ef2eca96cbad6
parent99932508718630a0746636ed7a7c2d2bb04499f0 (diff)
downloadmate-media-53788ae7006f4aa251104b81d2265d5bb5c80522.tar.bz2
mate-media-53788ae7006f4aa251104b81d2265d5bb5c80522.tar.xz
gvc-mixer-dialog: avoid declaration of same variable in different scope
Fixes cppcheck warnings: [mate-volume-control/gvc-mixer-dialog.c:379] -> [mate-volume-control/gvc-mixer-dialog.c:405]: (style) Local variable control shadows outer variable [mate-volume-control/gvc-mixer-dialog.c:535] -> [mate-volume-control/gvc-mixer-dialog.c:586]: (style) Local variable control shadows outer variable
-rw-r--r--mate-volume-control/gvc-mixer-dialog.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/mate-volume-control/gvc-mixer-dialog.c b/mate-volume-control/gvc-mixer-dialog.c
index 3a28a06..e191bfc 100644
--- a/mate-volume-control/gvc-mixer-dialog.c
+++ b/mate-volume-control/gvc-mixer-dialog.c
@@ -402,7 +402,6 @@ set_output_stream (GvcMixerDialog *dialog, MateMixerStream *stream)
/* Move all stored controls to the newly selected default stream */
while (controls != NULL) {
MateMixerStream *parent;
- MateMixerStreamControl *control;
control = MATE_MIXER_STREAM_CONTROL (controls->data);
parent = mate_mixer_stream_control_get_stream (control);
@@ -583,8 +582,7 @@ set_input_stream (GvcMixerDialog *dialog, MateMixerStream *stream)
}
if (page == PAGE_INPUT) {
- MateMixerStreamControl *control =
- gvc_channel_bar_get_control (GVC_CHANNEL_BAR (dialog->priv->input_bar));
+ control = gvc_channel_bar_get_control (GVC_CHANNEL_BAR (dialog->priv->input_bar));
if (G_LIKELY (control != NULL))
mate_mixer_stream_control_set_monitor_enabled (control, TRUE);