summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel-hollerbach@t-online.de>2017-02-23 09:08:24 +0100
committerMarcel Hollerbach <marcel-hollerbach@t-online.de>2017-02-23 09:08:24 +0100
commit9745890a37036091d5dec320fecda7ed4c6bdb6c (patch)
tree4bd6e96802bcd248b8a1c253c640f22a7318410b
parent2e043e825d1c22de3be0beddd5db43753fde984e (diff)
Revert "Revert "mixer: do not set back the value from emix once the drag is finished""
This reverts commit fba185798cf75eaeaba4a95d2be25fb2fea6ef1a. There is not even a description why you reverted it. This is a bugfix that fixed a bug. So talk to me what the issue is, but please stop reverting commits silently.
-rw-r--r--src/modules/mixer/e_mod_main.c11
-rw-r--r--src/modules/mixer/emixer.c13
2 files changed, 0 insertions, 24 deletions
diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c
index ac805cce8..2c8691557 100644
--- a/src/modules/mixer/e_mod_main.c
+++ b/src/modules/mixer/e_mod_main.c
@@ -481,16 +481,6 @@ _slider_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
481} 481}
482 482
483static void 483static void
484_slider_drag_stop_cb(void *data EINA_UNUSED, Evas_Object *obj,
485 void *event EINA_UNUSED)
486{
487 EINA_SAFETY_ON_NULL_RETURN(mixer_context->sink_default);
488 Emix_Sink *s = (Emix_Sink *)mixer_context->sink_default;
489 int val = s->volume.volumes[0];
490 elm_slider_value_set(obj, val);
491}
492
493static void
494_sink_selected_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 484_sink_selected_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
495{ 485{
496 Emix_Sink *s = data; 486 Emix_Sink *s = data;
@@ -554,7 +544,6 @@ _popup_new(Instance *inst)
554 evas_object_show(slider); 544 evas_object_show(slider);
555 elm_slider_min_max_set(slider, 0.0, emix_max_volume_get()); 545 elm_slider_min_max_set(slider, 0.0, emix_max_volume_get());
556 evas_object_smart_callback_add(slider, "changed", _slider_changed_cb, NULL); 546 evas_object_smart_callback_add(slider, "changed", _slider_changed_cb, NULL);
557 evas_object_smart_callback_add(slider, "slider,drag,stop", _slider_drag_stop_cb, NULL);
558 elm_slider_value_set(slider, volume); 547 elm_slider_value_set(slider, volume);
559 elm_box_pack_end(bx, slider); 548 elm_box_pack_end(bx, slider);
560 evas_object_show(slider); 549 evas_object_show(slider);
diff --git a/src/modules/mixer/emixer.c b/src/modules/mixer/emixer.c
index 5cde88127..1bcd96c1f 100644
--- a/src/modules/mixer/emixer.c
+++ b/src/modules/mixer/emixer.c
@@ -49,17 +49,6 @@ _cb_sink_volume_change(void *data,
49} 49}
50 50
51static void 51static void
52_cb_sink_volume_drag_stop(void *data,
53 Evas_Object *obj,
54 void *event EINA_UNUSED)
55{
56 Evas_Object *bxv = data;
57 Emix_Sink *sink = evas_object_data_get(bxv, "sink");
58 int vol = sink->volume.volumes[0];
59 elm_slider_value_set(obj, vol);
60}
61
62static void
63_cb_sink_mute_change(void *data, 52_cb_sink_mute_change(void *data,
64 Evas_Object *obj, 53 Evas_Object *obj,
65 void *event_info EINA_UNUSED) 54 void *event_info EINA_UNUSED)
@@ -134,8 +123,6 @@ _emix_sink_add(Emix_Sink *sink)
134 elm_box_pack_end(bx, sl); 123 elm_box_pack_end(bx, sl);
135 evas_object_show(sl); 124 evas_object_show(sl);
136 evas_object_smart_callback_add(sl, "changed", _cb_sink_volume_change, bxv); 125 evas_object_smart_callback_add(sl, "changed", _cb_sink_volume_change, bxv);
137 evas_object_smart_callback_add(sl, "slider,drag,stop",
138 _cb_sink_volume_drag_stop, bxv);
139 126
140 ck = elm_check_add(win); 127 ck = elm_check_add(win);
141 evas_object_data_set(bxv, "mute", ck); 128 evas_object_data_set(bxv, "mute", ck);