1 |
commit: 335c394272ed2bc0ebfa98b7322b599b6c209919 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 8 11:14:19 2020 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 8 11:14:39 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335c3942 |
7 |
|
8 |
media-sound/sooperlooper: bump to 1.7.4 + removed 1.7.3 |
9 |
|
10 |
1) eapi7, 3.0-gtk3 |
11 |
2) added desktop file |
12 |
3) updated deps + switched to virtual/jack |
13 |
|
14 |
Closes: https://bugs.gentoo.org/714210 |
15 |
Closes: https://bugs.gentoo.org/736318 |
16 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
17 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
18 |
|
19 |
media-sound/sooperlooper/Manifest | 2 +- |
20 |
.../files/sooperlooper-1.7.3-clash.patch | 661 --------------------- |
21 |
.../files/sooperlooper-1.7.3-libsigc28.patch | 124 ---- |
22 |
.../files/sooperlooper-1.7.3-tinfo.patch | 22 - |
23 |
.../files/sooperlooper-1.7.3-wx3.0.patch | 177 ------ |
24 |
...r-1.7.3-r2.ebuild => sooperlooper-1.7.4.ebuild} | 42 +- |
25 |
6 files changed, 22 insertions(+), 1006 deletions(-) |
26 |
|
27 |
diff --git a/media-sound/sooperlooper/Manifest b/media-sound/sooperlooper/Manifest |
28 |
index 7f039640721..f9fbef1f2d2 100644 |
29 |
--- a/media-sound/sooperlooper/Manifest |
30 |
+++ b/media-sound/sooperlooper/Manifest |
31 |
@@ -1,2 +1,2 @@ |
32 |
DIST sooperlooper-1.6.5-m4.tar.bz2 1463 BLAKE2B b02010f5aae113078d167b65a8ab232673eac622ae6595d23f4759fafa05aeb503ea30ace950b3e9cb4d85abe92af7eda13e4c5a3199630c83f2761c812bc9f7 SHA512 01b4405dcd91e617c8dafb9fcfab99507d0a9637d9b0eec84276c348968e31159b68ce5c8b7f900ab8a830f2b5c91b798146d5272d006a2b866f149e485f228d |
33 |
-DIST sooperlooper-1.7.3.tar.gz 732406 BLAKE2B 65adf851c0f8e4152176ac5a53a02c2113cb4876f1abf1cbbc5c12556d8508b8e1b063cc7107032f6cd3118afa3f239303c7b04e66786bded24e5950bef16bf7 SHA512 cbc9f6b3e4cafc6f18ddb2e2415d2bac274c8cc578b5dadc6ad878b1bed34e514208bc990c3a7dab0106cbf34ad16be12846851e446d724d77386e70d975e14b |
34 |
+DIST sooperlooper-1.7.4.tar.gz 857069 BLAKE2B 0e7f13195a73ec9e41deaf93443c612bd2e44a3133dcc5685a3da497bfdc2acb24c5de33ea853c79e3c1a13c552d19f06370d96fe8fd17569c6e94541d035f5f SHA512 f2921346759ad3821c43cc75d77e3a5b3a5433e03204048580e36cd2cddb08bd2447e509e01e01fcce4585a1759a913fd01fd098a50d9bcdb30f8dde6cc509c2 |
35 |
|
36 |
diff --git a/media-sound/sooperlooper/files/sooperlooper-1.7.3-clash.patch b/media-sound/sooperlooper/files/sooperlooper-1.7.3-clash.patch |
37 |
deleted file mode 100644 |
38 |
index a5df2e2c225..00000000000 |
39 |
--- a/media-sound/sooperlooper/files/sooperlooper-1.7.3-clash.patch |
40 |
+++ /dev/null |
41 |
@@ -1,661 +0,0 @@ |
42 |
-From 0cb1e65166c777250cf3737c418fcfc12ffac815 Mon Sep 17 00:00:00 2001 |
43 |
-From: vixus0 <vixus0@×××××.com> |
44 |
-Date: Tue, 7 Jun 2016 22:10:39 +0100 |
45 |
-Subject: [PATCH] Use sigc::bind due to clash with std::bind |
46 |
- |
47 |
---- |
48 |
- src/engine.cpp | 2 +- |
49 |
- src/gui/latency_panel.cpp | 4 +- |
50 |
- src/gui/looper_panel.cpp | 182 +++++++++++++++++++++++----------------------- |
51 |
- src/gui/main_panel.cpp | 150 +++++++++++++++++++------------------- |
52 |
- 4 files changed, 169 insertions(+), 169 deletions(-) |
53 |
- |
54 |
-diff --git a/src/engine.cpp b/src/engine.cpp |
55 |
-index a7a6395..3175c20 100644 |
56 |
---- a/src/engine.cpp |
57 |
-+++ b/src/engine.cpp |
58 |
-@@ -313,7 +313,7 @@ void Engine::set_midi_bridge (MidiBridge * bridge) |
59 |
- _midi_bridge->MidiControlEvent.connect (mem_fun(*this, &Engine::push_midi_control_event)); |
60 |
- _midi_bridge->MidiSyncEvent.connect (mem_fun(*this, &Engine::push_sync_event)); |
61 |
- |
62 |
-- ParamChanged.connect(bind (mem_fun(*_midi_bridge, &MidiBridge::parameter_changed), this)); |
63 |
-+ ParamChanged.connect(sigc::bind(mem_fun(*_midi_bridge, &MidiBridge::parameter_changed), this)); |
64 |
- |
65 |
- _midi_bridge->set_output_midi_clock(_output_midi_clock); |
66 |
- } |
67 |
-diff --git a/src/gui/latency_panel.cpp b/src/gui/latency_panel.cpp |
68 |
-index 10e16e8..cb28723 100644 |
69 |
---- a/src/gui/latency_panel.cpp |
70 |
-+++ b/src/gui/latency_panel.cpp |
71 |
-@@ -150,7 +150,7 @@ void LatencyPanel::init() |
72 |
- _input_spin->set_allow_outside_bounds(false); |
73 |
- //_input_spin->SetFont (sliderFont); |
74 |
- _input_spin->set_decimal_digits(0); |
75 |
-- _input_spin->value_changed.connect (bind (mem_fun (*this, &LatencyPanel::on_spin_change), (int) ID_InputLatency)); |
76 |
-+ _input_spin->value_changed.connect (sigc::bind(mem_fun (*this, &LatencyPanel::on_spin_change), (int) ID_InputLatency)); |
77 |
- rowsizer->Add (_input_spin, 1, wxLEFT|wxEXPAND, 10); |
78 |
- |
79 |
- _output_spin = new SpinBox(this, ID_OutputLatency, 0.0f, 100000.0f, 512.0f, false, wxDefaultPosition, wxSize(200, 35)); |
80 |
-@@ -160,7 +160,7 @@ void LatencyPanel::init() |
81 |
- _output_spin->set_allow_outside_bounds(false); |
82 |
- _output_spin->set_decimal_digits(0); |
83 |
- //_output_spin->SetFont (sliderFont); |
84 |
-- _output_spin->value_changed.connect (bind (mem_fun (*this, &LatencyPanel::on_spin_change), (int) ID_OutputLatency)); |
85 |
-+ _output_spin->value_changed.connect (sigc::bind(mem_fun (*this, &LatencyPanel::on_spin_change), (int) ID_OutputLatency)); |
86 |
- rowsizer->Add (_output_spin, 1, wxLEFT|wxRIGHT|wxEXPAND, 10); |
87 |
- |
88 |
- |
89 |
-diff --git a/src/gui/looper_panel.cpp b/src/gui/looper_panel.cpp |
90 |
-index 4c5650d..34f7a84 100644 |
91 |
---- a/src/gui/looper_panel.cpp |
92 |
-+++ b/src/gui/looper_panel.cpp |
93 |
-@@ -212,8 +212,8 @@ LooperPanel::init() |
94 |
- slider->set_show_indicator_bar (false); |
95 |
- slider->set_scale_mode(SliderBar::ZeroGainMode); |
96 |
- slider->SetFont(sliderFont); |
97 |
-- slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); |
98 |
-- slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); |
99 |
-+ slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); |
100 |
-+ slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); |
101 |
- inthresh_sizer->Add (slider, 1, wxALL|wxEXPAND, 0); |
102 |
- |
103 |
- _thresh_control = slider = new SliderBar(this, ID_ThreshControl, 0.0f, 1.0f, 0.0f); |
104 |
-@@ -222,8 +222,8 @@ LooperPanel::init() |
105 |
- slider->set_show_indicator_bar (true); |
106 |
- slider->set_scale_mode(SliderBar::ZeroGainMode); |
107 |
- slider->SetFont(sliderFont); |
108 |
-- slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); |
109 |
-- slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); |
110 |
-+ slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); |
111 |
-+ slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); |
112 |
- inthresh_sizer->Add (slider, 1, wxLEFT|wxEXPAND, 3); |
113 |
- |
114 |
- colsizer->Add (inthresh_sizer, 1, wxEXPAND|wxLEFT, 5); |
115 |
-@@ -232,8 +232,8 @@ LooperPanel::init() |
116 |
- slider->set_units(wxT("%")); |
117 |
- slider->set_label(wxT("feedback")); |
118 |
- slider->SetFont(sliderFont); |
119 |
-- slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); |
120 |
-- slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); |
121 |
-+ slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); |
122 |
-+ slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); |
123 |
- |
124 |
- _maininsizer->Add (slider, 1, wxEXPAND|wxTOP, 5); |
125 |
- |
126 |
-@@ -281,8 +281,8 @@ LooperPanel::init() |
127 |
- // slider->set_label(wxT("dry")); |
128 |
- // slider->set_scale_mode(SliderBar::ZeroGainMode); |
129 |
- // slider->SetFont(sliderFont); |
130 |
--// slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); |
131 |
--// slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); |
132 |
-+// slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); |
133 |
-+// slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); |
134 |
- // _toppansizer->Add (slider, 1, wxEXPAND, 0); |
135 |
- |
136 |
- // panners are added later |
137 |
-@@ -297,8 +297,8 @@ LooperPanel::init() |
138 |
- slider->set_show_indicator_bar (true); |
139 |
- slider->set_scale_mode(SliderBar::ZeroGainMode); |
140 |
- slider->SetFont(sliderFont); |
141 |
-- slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); |
142 |
-- slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); |
143 |
-+ slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); |
144 |
-+ slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); |
145 |
- _botpansizer->Add (slider, 1, wxEXPAND, 0); |
146 |
- |
147 |
- /* |
148 |
-@@ -307,7 +307,7 @@ LooperPanel::init() |
149 |
- _outlatency_spin->set_label(wxT("o.lat")); |
150 |
- _outlatency_spin->set_snap_mode (SpinBox::IntegerSnap); |
151 |
- _outlatency_spin->set_allow_outside_bounds(true); |
152 |
-- _outlatency_spin->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) _outlatency_spin->GetId())); |
153 |
-+ _outlatency_spin->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) _outlatency_spin->GetId())); |
154 |
- _outlatency_spin->SetFont(sliderFont); |
155 |
- _botpansizer->Add (_outlatency_spin, 0, wxALL, 0); |
156 |
- |
157 |
-@@ -316,7 +316,7 @@ LooperPanel::init() |
158 |
- _inlatency_spin->set_label(wxT("i.lat")); |
159 |
- _inlatency_spin->set_snap_mode (SpinBox::IntegerSnap); |
160 |
- _inlatency_spin->set_allow_outside_bounds(true); |
161 |
-- _inlatency_spin->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) _inlatency_spin->GetId())); |
162 |
-+ _inlatency_spin->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) _inlatency_spin->GetId())); |
163 |
- _inlatency_spin->SetFont(sliderFont); |
164 |
- _botpansizer->Add (_inlatency_spin, 0, wxALL, 0); |
165 |
- */ |
166 |
-@@ -361,8 +361,8 @@ LooperPanel::init() |
167 |
- _sync_check = new CheckBox(this, ID_SyncCheck, wxT("sync"), true, wxDefaultPosition, wxSize(55, 18)); |
168 |
- _sync_check->SetFont(sliderFont); |
169 |
- _sync_check->SetToolTip(wxT("sync operations to quantize source")); |
170 |
-- _sync_check->value_changed.connect (bind (mem_fun (*this, &LooperPanel::check_events), wxT("sync"))); |
171 |
-- _sync_check->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) _sync_check->GetId())); |
172 |
-+ _sync_check->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::check_events), wxT("sync"))); |
173 |
-+ _sync_check->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) _sync_check->GetId())); |
174 |
- lilrowsizer->Add (_sync_check, 1, wxLEFT, 3); |
175 |
- lilcolsizer->Add (lilrowsizer, 0, wxTOP|wxEXPAND, 0); |
176 |
- |
177 |
-@@ -370,8 +370,8 @@ LooperPanel::init() |
178 |
- _play_sync_check = new CheckBox(this, ID_PlaySyncCheck, wxT("play sync"), true, wxDefaultPosition, wxSize(55, 18)); |
179 |
- _play_sync_check->SetFont(sliderFont); |
180 |
- _play_sync_check->SetToolTip(wxT("sync playback auto-triggering to quantized sync source")); |
181 |
-- _play_sync_check->value_changed.connect (bind (mem_fun (*this, &LooperPanel::check_events), wxT("playback_sync"))); |
182 |
-- _play_sync_check->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) _play_sync_check->GetId())); |
183 |
-+ _play_sync_check->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::check_events), wxT("playback_sync"))); |
184 |
-+ _play_sync_check->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) _play_sync_check->GetId())); |
185 |
- lilrowsizer->Add (_play_sync_check, 1, wxLEFT, 3); |
186 |
- lilcolsizer->Add (lilrowsizer, 0, wxTOP|wxEXPAND, 0); |
187 |
- |
188 |
-@@ -379,15 +379,15 @@ LooperPanel::init() |
189 |
- _play_feed_check = new CheckBox(this, ID_UseFeedbackPlayCheck, wxT("p. feedb"), true, wxDefaultPosition, wxSize(55, 18)); |
190 |
- _play_feed_check->SetFont(sliderFont); |
191 |
- _play_feed_check->SetToolTip(wxT("enable feedback during playback")); |
192 |
-- _play_feed_check->value_changed.connect (bind (mem_fun (*this, &LooperPanel::check_events), wxT("use_feedback_play"))); |
193 |
-- _play_feed_check->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) _play_feed_check->GetId())); |
194 |
-+ _play_feed_check->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::check_events), wxT("use_feedback_play"))); |
195 |
-+ _play_feed_check->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) _play_feed_check->GetId())); |
196 |
- lilrowsizer->Add (_play_feed_check, 1, wxLEFT, 3); |
197 |
- |
198 |
- _tempo_stretch_check = new CheckBox(this, ID_TempoStretchCheck, wxT("t. stretch"), true, wxDefaultPosition, wxSize(55, 18)); |
199 |
- _tempo_stretch_check->SetFont(sliderFont); |
200 |
- _tempo_stretch_check->SetToolTip(wxT("enable automatic timestretch when tempo changes")); |
201 |
-- _tempo_stretch_check->value_changed.connect (bind (mem_fun (*this, &LooperPanel::check_events), wxT("tempo_stretch"))); |
202 |
-- _tempo_stretch_check->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) _tempo_stretch_check->GetId())); |
203 |
-+ _tempo_stretch_check->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::check_events), wxT("tempo_stretch"))); |
204 |
-+ _tempo_stretch_check->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) _tempo_stretch_check->GetId())); |
205 |
- lilrowsizer->Add (_tempo_stretch_check, 1, wxLEFT, 3); |
206 |
- |
207 |
- lilcolsizer->Add (lilrowsizer, 0, wxTOP|wxEXPAND, 0); |
208 |
-@@ -440,8 +440,8 @@ LooperPanel::init() |
209 |
- slider->set_show_value(false); |
210 |
- slider->set_show_indicator_bar (true); |
211 |
- slider->SetFont(sliderFont); |
212 |
-- slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); |
213 |
-- slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); |
214 |
-+ slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); |
215 |
-+ slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); |
216 |
- rowsizer->Add (slider, 1, wxEXPAND|wxTOP|wxLEFT, 3); |
217 |
- |
218 |
- // pitch control |
219 |
-@@ -452,8 +452,8 @@ LooperPanel::init() |
220 |
- slider->set_decimal_digits (1); |
221 |
- slider->set_snap_mode(SliderBar::IntegerSnap); |
222 |
- slider->SetFont(sliderFont); |
223 |
-- slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); |
224 |
-- slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); |
225 |
-+ slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); |
226 |
-+ slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); |
227 |
- rowsizer->Add (slider, 1, wxEXPAND|wxTOP|wxLEFT, 3); |
228 |
- |
229 |
- // pause |
230 |
-@@ -476,8 +476,8 @@ LooperPanel::init() |
231 |
- slider->set_style (SliderBar::CenterStyle); |
232 |
- slider->set_decimal_digits (3); |
233 |
- slider->SetFont(sliderFont); |
234 |
-- slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); |
235 |
-- slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); |
236 |
-+ slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); |
237 |
-+ slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); |
238 |
- rowsizer->Add (slider, 1, wxEXPAND|wxTOP|wxLEFT, 3); |
239 |
- |
240 |
- // stretch control |
241 |
-@@ -487,8 +487,8 @@ LooperPanel::init() |
242 |
- slider->set_style (SliderBar::CenterStyle); |
243 |
- slider->set_decimal_digits (2); |
244 |
- slider->SetFont(sliderFont); |
245 |
-- slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); |
246 |
-- slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); |
247 |
-+ slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); |
248 |
-+ slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); |
249 |
- rowsizer->Add (slider, 1, wxEXPAND|wxTOP|wxLEFT, 3); |
250 |
- |
251 |
- |
252 |
-@@ -498,7 +498,7 @@ LooperPanel::init() |
253 |
- _triglatency_spin->set_label(wxT("t.lat")); |
254 |
- _triglatency_spin->set_snap_mode (SpinBox::IntegerSnap); |
255 |
- _triglatency_spin->set_allow_outside_bounds(true); |
256 |
-- _triglatency_spin->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) _triglatency_spin->GetId())); |
257 |
-+ _triglatency_spin->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) _triglatency_spin->GetId())); |
258 |
- _triglatency_spin->SetFont(sliderFont); |
259 |
- rowsizer->Add (_triglatency_spin, 0, wxALL, 0); |
260 |
- */ |
261 |
-@@ -555,15 +555,15 @@ LooperPanel::post_init() |
262 |
- slider->set_label(wxT("in mon")); |
263 |
- slider->set_scale_mode(SliderBar::ZeroGainMode); |
264 |
- slider->SetFont(sliderFont); |
265 |
-- slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); |
266 |
-- slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); |
267 |
-+ slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::slider_events), (int) slider->GetId())); |
268 |
-+ slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) slider->GetId())); |
269 |
- _toppansizer->Add (slider, 1, wxEXPAND, 0); |
270 |
- |
271 |
- _use_main_in_check = new CheckBox(this, ID_UseMainInCheck, wxT("main in"), true, wxDefaultPosition, wxSize(65, 18)); |
272 |
- _use_main_in_check->SetFont(sliderFont); |
273 |
- _use_main_in_check->SetToolTip(wxT("mix input from Main inputs")); |
274 |
-- _use_main_in_check->value_changed.connect (bind (mem_fun (*this, &LooperPanel::check_events), wxT("use_common_ins"))); |
275 |
-- _use_main_in_check->bind_request.connect (bind (mem_fun (*this, &LooperPanel::control_bind_events), (int) _use_main_in_check->GetId())); |
276 |
-+ _use_main_in_check->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::check_events), wxT("use_common_ins"))); |
277 |
-+ _use_main_in_check->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::control_bind_events), (int) _use_main_in_check->GetId())); |
278 |
- _maininsizer->Add (_use_main_in_check, 0, wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL ,0); |
279 |
- _maininsizer->Layout(); |
280 |
- |
281 |
-@@ -595,8 +595,8 @@ LooperPanel::post_init() |
282 |
- slider->set_decimal_digits (3); |
283 |
- slider->set_show_value (false); |
284 |
- slider->SetFont(sliderFont); |
285 |
-- slider->value_changed.connect (bind (mem_fun (*this, &LooperPanel::pan_events), (int) i)); |
286 |
-- slider->bind_request.connect (bind (mem_fun (*this, &LooperPanel::pan_bind_events), (int) i)); |
287 |
-+ slider->value_changed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pan_events), (int) i)); |
288 |
-+ slider->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::pan_bind_events), (int) i)); |
289 |
- |
290 |
- if (!_has_discrete_io) { |
291 |
- _toppansizer->Add (slider, 1, (i==0) ? wxEXPAND : wxEXPAND|wxLEFT, 2); |
292 |
-@@ -652,83 +652,83 @@ LooperPanel::set_index(int ind) |
293 |
- void |
294 |
- LooperPanel::bind_events() |
295 |
- { |
296 |
-- _undo_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("undo")))); |
297 |
-- _undo_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("undo")))); |
298 |
-- _undo_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("undo")))); |
299 |
-+ _undo_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("undo")))); |
300 |
-+ _undo_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("undo")))); |
301 |
-+ _undo_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("undo")))); |
302 |
- |
303 |
-- _redo_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("redo")))); |
304 |
-- _redo_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("redo")))); |
305 |
-- _redo_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("redo")))); |
306 |
-+ _redo_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("redo")))); |
307 |
-+ _redo_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("redo")))); |
308 |
-+ _redo_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("redo")))); |
309 |
- |
310 |
-- _record_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("record")))); |
311 |
-- _record_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("record")))); |
312 |
-- _record_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("record")))); |
313 |
-+ _record_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("record")))); |
314 |
-+ _record_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("record")))); |
315 |
-+ _record_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("record")))); |
316 |
- |
317 |
-- _overdub_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("overdub")))); |
318 |
-- _overdub_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("overdub")))); |
319 |
-- _overdub_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("overdub")))); |
320 |
-+ _overdub_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("overdub")))); |
321 |
-+ _overdub_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("overdub")))); |
322 |
-+ _overdub_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("overdub")))); |
323 |
- |
324 |
-- _multiply_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("multiply")))); |
325 |
-- _multiply_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("multiply")))); |
326 |
-- _multiply_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("multiply")))); |
327 |
-+ _multiply_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("multiply")))); |
328 |
-+ _multiply_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("multiply")))); |
329 |
-+ _multiply_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("multiply")))); |
330 |
- |
331 |
-- _replace_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("replace")))); |
332 |
-- _replace_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("replace")))); |
333 |
-- _replace_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("replace")))); |
334 |
-+ _replace_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("replace")))); |
335 |
-+ _replace_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("replace")))); |
336 |
-+ _replace_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("replace")))); |
337 |
- |
338 |
-- _insert_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("insert")))); |
339 |
-- _insert_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("insert")))); |
340 |
-- _insert_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("insert")))); |
341 |
-+ _insert_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("insert")))); |
342 |
-+ _insert_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("insert")))); |
343 |
-+ _insert_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("insert")))); |
344 |
- |
345 |
-- _once_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("oneshot")))); |
346 |
-- _once_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("oneshot")))); |
347 |
-- _once_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("oneshot")))); |
348 |
-+ _once_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("oneshot")))); |
349 |
-+ _once_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("oneshot")))); |
350 |
-+ _once_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("oneshot")))); |
351 |
- |
352 |
-- _trig_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("trigger")))); |
353 |
-- _trig_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("trigger")))); |
354 |
-- _trig_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("trigger")))); |
355 |
-+ _trig_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("trigger")))); |
356 |
-+ _trig_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("trigger")))); |
357 |
-+ _trig_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("trigger")))); |
358 |
- |
359 |
- _delay_button->pressed.connect (mem_fun (*this, &LooperPanel::delay_button_press_event)); |
360 |
- _delay_button->released.connect (mem_fun (*this, &LooperPanel::delay_button_release_event)); |
361 |
-- _delay_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("delay_trigger")))); |
362 |
-+ _delay_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("delay_trigger")))); |
363 |
- |
364 |
-- _reverse_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("reverse")))); |
365 |
-- _reverse_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("reverse")))); |
366 |
-- _reverse_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("reverse")))); |
367 |
-+ _reverse_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("reverse")))); |
368 |
-+ _reverse_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("reverse")))); |
369 |
-+ _reverse_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("reverse")))); |
370 |
- |
371 |
-- _substitute_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("substitute")))); |
372 |
-- _substitute_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("substitute")))); |
373 |
-- _substitute_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("substitute")))); |
374 |
-+ _substitute_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("substitute")))); |
375 |
-+ _substitute_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("substitute")))); |
376 |
-+ _substitute_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("substitute")))); |
377 |
- |
378 |
-- _mute_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("mute")))); |
379 |
-- _mute_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("mute")))); |
380 |
-- _mute_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("mute")))); |
381 |
-+ _mute_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("mute")))); |
382 |
-+ _mute_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("mute")))); |
383 |
-+ _mute_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("mute")))); |
384 |
- |
385 |
-- _pause_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("pause")))); |
386 |
-- _pause_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("pause")))); |
387 |
-- _pause_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("pause")))); |
388 |
-+ _pause_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("pause")))); |
389 |
-+ _pause_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("pause")))); |
390 |
-+ _pause_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("pause")))); |
391 |
- |
392 |
-- _solo_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("solo")))); |
393 |
-- _solo_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("solo")))); |
394 |
-- _solo_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("solo")))); |
395 |
-+ _solo_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("solo")))); |
396 |
-+ _solo_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("solo")))); |
397 |
-+ _solo_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("solo")))); |
398 |
- |
399 |
-- _halfx_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::rate_button_event), 0.5f)); |
400 |
-- _halfx_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::rate_bind_events), 0.5f)); |
401 |
-- _1x_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::rate_button_event), 1.0f)); |
402 |
-- _1x_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::rate_bind_events), 1.0f)); |
403 |
-- _2x_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::rate_button_event), 2.0f)); |
404 |
-- _2x_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::rate_bind_events), 2.0f)); |
405 |
-+ _halfx_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::rate_button_event), 0.5f)); |
406 |
-+ _halfx_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::rate_bind_events), 0.5f)); |
407 |
-+ _1x_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::rate_button_event), 1.0f)); |
408 |
-+ _1x_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::rate_bind_events), 1.0f)); |
409 |
-+ _2x_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::rate_button_event), 2.0f)); |
410 |
-+ _2x_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::rate_bind_events), 2.0f)); |
411 |
- |
412 |
-- _scratch_button->pressed.connect (bind (mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("scratch")))); |
413 |
-- _scratch_button->released.connect (bind (mem_fun (*this, &LooperPanel::released_events), wxString(wxT("scratch")))); |
414 |
-- _scratch_button->bind_request.connect (bind (mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("scratch")))); |
415 |
-+ _scratch_button->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::pressed_events), wxString(wxT("scratch")))); |
416 |
-+ _scratch_button->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::released_events), wxString(wxT("scratch")))); |
417 |
-+ _scratch_button->bind_request.connect (sigc::bind(mem_fun (*this, &LooperPanel::button_bind_events), wxString(wxT("scratch")))); |
418 |
- |
419 |
-- _save_button->clicked.connect (bind (mem_fun (*this, &LooperPanel::clicked_events), wxString(wxT("save")))); |
420 |
-- _load_button->clicked.connect (bind (mem_fun (*this, &LooperPanel::clicked_events), wxString(wxT("load")))); |
421 |
-+ _save_button->clicked.connect (sigc::bind(mem_fun (*this, &LooperPanel::clicked_events), wxString(wxT("save")))); |
422 |
-+ _load_button->clicked.connect (sigc::bind(mem_fun (*this, &LooperPanel::clicked_events), wxString(wxT("load")))); |
423 |
- |
424 |
- |
425 |
-- _scratch_control->pressed.connect (bind (mem_fun (*this, &LooperPanel::scratch_events), wxString(wxT("scratch_press")))); |
426 |
-- _scratch_control->released.connect (bind (mem_fun (*this, &LooperPanel::scratch_events), wxString(wxT("scratch_release")))); |
427 |
-+ _scratch_control->pressed.connect (sigc::bind(mem_fun (*this, &LooperPanel::scratch_events), wxString(wxT("scratch_press")))); |
428 |
-+ _scratch_control->released.connect (sigc::bind(mem_fun (*this, &LooperPanel::scratch_events), wxString(wxT("scratch_release")))); |
429 |
- |
430 |
- |
431 |
- _loop_control->MidiBindingChanged.connect (mem_fun (*this, &LooperPanel::got_binding_changed)); |
432 |
-diff --git a/src/gui/main_panel.cpp b/src/gui/main_panel.cpp |
433 |
-index 1734eb6..b0c1bac 100644 |
434 |
---- a/src/gui/main_panel.cpp |
435 |
-+++ b/src/gui/main_panel.cpp |
436 |
-@@ -217,7 +217,7 @@ MainPanel::init() |
437 |
- _sync_choice->set_label (wxT("sync to")); |
438 |
- _sync_choice->SetFont (sliderFont); |
439 |
- _sync_choice->value_changed.connect (mem_fun (*this, &MainPanel::on_syncto_change)); |
440 |
-- _sync_choice->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("sync"))); |
441 |
-+ _sync_choice->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("sync"))); |
442 |
- |
443 |
- rowsizer->Add (_sync_choice, 0, wxALL|wxEXPAND, 2); |
444 |
- |
445 |
-@@ -228,7 +228,7 @@ MainPanel::init() |
446 |
- _tempo_bar->set_allow_outside_bounds(true); |
447 |
- _tempo_bar->SetFont (sliderFont); |
448 |
- _tempo_bar->value_changed.connect (mem_fun (*this, &MainPanel::on_tempo_change)); |
449 |
-- _tempo_bar->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("tempo"))); |
450 |
-+ _tempo_bar->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("tempo"))); |
451 |
- rowsizer->Add (_tempo_bar, 0, wxALL|wxEXPAND, 2); |
452 |
- |
453 |
- _taptempo_button = new PixButton(_top_panel, ID_TapTempoButton, true); |
454 |
-@@ -239,7 +239,7 @@ MainPanel::init() |
455 |
- _taptempo_button->set_active_bitmap (wxBitmap(tap_tempo_active)); |
456 |
- _taptempo_button->pressed.connect (mem_fun (*this, &MainPanel::on_taptempo_press)); |
457 |
- _taptempo_button->released.connect (mem_fun (*this, &MainPanel::on_taptempo_release)); |
458 |
-- _taptempo_button->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("taptempo"))); |
459 |
-+ _taptempo_button->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("taptempo"))); |
460 |
- rowsizer->Add (_taptempo_button, 0, wxALL|wxEXPAND, 2); |
461 |
- |
462 |
- |
463 |
-@@ -250,7 +250,7 @@ MainPanel::init() |
464 |
- _eighth_cycle_bar->set_allow_outside_bounds(true); |
465 |
- _eighth_cycle_bar->SetFont (sliderFont); |
466 |
- _eighth_cycle_bar->value_changed.connect (mem_fun (*this, &MainPanel::on_eighth_change)); |
467 |
-- _eighth_cycle_bar->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("eighth"))); |
468 |
-+ _eighth_cycle_bar->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("eighth"))); |
469 |
- rowsizer->Add (_eighth_cycle_bar, 0, wxALL|wxEXPAND, 2); |
470 |
- |
471 |
- |
472 |
-@@ -258,7 +258,7 @@ MainPanel::init() |
473 |
- _quantize_choice->SetFont (sliderFont); |
474 |
- _quantize_choice->set_label (wxT("quantize")); |
475 |
- _quantize_choice->value_changed.connect (mem_fun (*this, &MainPanel::on_quantize_change)); |
476 |
-- _quantize_choice->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("quantize"))); |
477 |
-+ _quantize_choice->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("quantize"))); |
478 |
- _quantize_choice->append_choice (wxT("off"), 0); |
479 |
- _quantize_choice->append_choice (wxT("cycle"), 1); |
480 |
- _quantize_choice->append_choice (wxT("8th"), 2); |
481 |
-@@ -269,21 +269,21 @@ MainPanel::init() |
482 |
- _mute_quant_check->SetFont(sliderFont); |
483 |
- _mute_quant_check->SetToolTip(wxT("quantize mute operations")); |
484 |
- _mute_quant_check->value_changed.connect (mem_fun (*this, &MainPanel::on_mute_quant_check)); |
485 |
-- _mute_quant_check->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("mute_quantized"))); |
486 |
-+ _mute_quant_check->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("mute_quantized"))); |
487 |
- rowsizer->Add (_mute_quant_check, 0, wxALL|wxEXPAND, 2); |
488 |
- |
489 |
- _odub_quant_check = new CheckBox(_top_panel, ID_OdubQuantCheck, wxT("odub quant"), true, wxDefaultPosition, wxSize(90, 18)); |
490 |
- _odub_quant_check->SetFont(sliderFont); |
491 |
- _odub_quant_check->SetToolTip(wxT("quantize overdub operations")); |
492 |
- _odub_quant_check->value_changed.connect (mem_fun (*this, &MainPanel::on_odub_quant_check)); |
493 |
-- _odub_quant_check->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("overdub_quantized"))); |
494 |
-+ _odub_quant_check->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("overdub_quantized"))); |
495 |
- rowsizer->Add (_odub_quant_check, 0, wxALL|wxEXPAND, 2); |
496 |
- |
497 |
- _repl_quant_check = new CheckBox(_top_panel, ID_ReplQuantCheck, wxT("repl quant"), true, wxDefaultPosition, wxSize(90, 18)); |
498 |
- _repl_quant_check->SetFont(sliderFont); |
499 |
- _repl_quant_check->SetToolTip(wxT("quantize replace and substitute operations")); |
500 |
- _repl_quant_check->value_changed.connect (mem_fun (*this, &MainPanel::on_repl_quant_check)); |
501 |
-- _repl_quant_check->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("replace_quantized"))); |
502 |
-+ _repl_quant_check->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("replace_quantized"))); |
503 |
- rowsizer->Add (_repl_quant_check, 0, wxALL|wxEXPAND, 2); |
504 |
- |
505 |
- |
506 |
-@@ -305,7 +305,7 @@ MainPanel::init() |
507 |
- _xfade_bar->set_decimal_digits (0); |
508 |
- _xfade_bar->SetFont (sliderFont); |
509 |
- _xfade_bar->value_changed.connect (mem_fun (*this, &MainPanel::on_xfade_change)); |
510 |
-- _xfade_bar->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("fade_samples"))); |
511 |
-+ _xfade_bar->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("fade_samples"))); |
512 |
- rowsizer->Add (_xfade_bar, 0, wxALL|wxEXPAND, 2); |
513 |
- |
514 |
- _common_ingain_bar = new SliderBar(_top_panel, ID_InGainControl, 0.0f, 1.0f, 1.0f, true, wxDefaultPosition, wxSize(132,20)); |
515 |
-@@ -315,7 +315,7 @@ MainPanel::init() |
516 |
- _common_ingain_bar->set_show_indicator_bar(true); |
517 |
- _common_ingain_bar->SetFont(sliderFont); |
518 |
- _common_ingain_bar->value_changed.connect (mem_fun (*this, &MainPanel::on_ingain_change)); |
519 |
-- _common_ingain_bar->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("input_gain"))); |
520 |
-+ _common_ingain_bar->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("input_gain"))); |
521 |
- rowsizer->Add (_common_ingain_bar, 0, wxALL|wxEXPAND, 2); |
522 |
- |
523 |
- _common_dry_bar = new SliderBar(_top_panel, ID_DryControl, 0.0f, 1.0f, 1.0f, true, wxDefaultPosition, wxSize(132,20)); |
524 |
-@@ -325,7 +325,7 @@ MainPanel::init() |
525 |
- _common_dry_bar->set_show_indicator_bar(true); |
526 |
- _common_dry_bar->SetFont(sliderFont); |
527 |
- _common_dry_bar->value_changed.connect (mem_fun (*this, &MainPanel::on_dry_change)); |
528 |
-- _common_dry_bar->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("dry"))); |
529 |
-+ _common_dry_bar->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("dry"))); |
530 |
- rowsizer->Add (_common_dry_bar, 0, wxALL|wxEXPAND, 2); |
531 |
- |
532 |
- _common_wet_bar = new SliderBar(_top_panel, ID_WetControl, 0.0f, 1.0f, 1.0f, true, wxDefaultPosition, wxSize(132,20)); |
533 |
-@@ -335,7 +335,7 @@ MainPanel::init() |
534 |
- _common_wet_bar->set_show_indicator_bar(true); |
535 |
- _common_wet_bar->SetFont(sliderFont); |
536 |
- _common_wet_bar->value_changed.connect (mem_fun (*this, &MainPanel::on_wet_change)); |
537 |
-- _common_wet_bar->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("wet"))); |
538 |
-+ _common_wet_bar->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("wet"))); |
539 |
- rowsizer->Add (_common_wet_bar, 0, wxALL|wxEXPAND, 2); |
540 |
- |
541 |
- |
542 |
-@@ -343,13 +343,13 @@ MainPanel::init() |
543 |
- _round_check = new CheckBox (_top_panel, ID_RoundCheck, wxT("round"), true, wxDefaultPosition, wxSize(60, 20)); |
544 |
- _round_check->SetFont (sliderFont); |
545 |
- _round_check->value_changed.connect (mem_fun (*this, &MainPanel::on_round_check)); |
546 |
-- _round_check->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("round"))); |
547 |
-+ _round_check->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("round"))); |
548 |
- rowsizer->Add (_round_check, 0, wxALL|wxEXPAND, 2); |
549 |
- |
550 |
- _relsync_check = new CheckBox (_top_panel, ID_RelSyncCheck, wxT("rel sync"), true, wxDefaultPosition, wxSize(75, 20)); |
551 |
- _relsync_check->SetFont (sliderFont); |
552 |
- _relsync_check->value_changed.connect (mem_fun (*this, &MainPanel::on_relsync_check)); |
553 |
-- _relsync_check->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("relative_sync"))); |
554 |
-+ _relsync_check->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("relative_sync"))); |
555 |
- rowsizer->Add (_relsync_check, 0, wxALL|wxEXPAND, 2); |
556 |
- |
557 |
- |
558 |
-@@ -357,7 +357,7 @@ MainPanel::init() |
559 |
- _smart_eighths_check->SetFont(sliderFont); |
560 |
- _smart_eighths_check->SetToolTip(wxT("auto adjust 8ths per cycle with tempo")); |
561 |
- _smart_eighths_check->value_changed.connect (mem_fun (*this, &MainPanel::on_smart_eighths_check)); |
562 |
-- _smart_eighths_check->bind_request.connect (bind (mem_fun (*this, &MainPanel::on_bind_request), wxT("smart_eighths"))); |
563 |
-+ _smart_eighths_check->bind_request.connect (sigc::bind(mem_fun (*this, &MainPanel::on_bind_request), wxT("smart_eighths"))); |
564 |
- rowsizer->Add (_smart_eighths_check, 0, wxALL|wxEXPAND, 2); |
565 |
- |
566 |
- |
567 |
-@@ -379,7 +379,7 @@ MainPanel::init() |
568 |
- |
569 |
- // todo request how many loopers to construct based on connection |
570 |
- _loop_connect_connection = _loop_control->LooperConnected.connect (mem_fun (*this, &MainPanel::init_loopers)); |
571 |
-- _loop_disconnect_connection = _loop_control->Disconnected.connect (bind (mem_fun (*this, &MainPanel::init_loopers), 0)); |
572 |
-+ _loop_disconnect_connection = _loop_control->Disconnected.connect (sigc::bind(mem_fun (*this, &MainPanel::init_loopers), 0)); |
573 |
- _loop_update_connection = _loop_control->NewDataReady.connect (mem_fun (*this, &MainPanel::osc_data_ready)); |
574 |
- |
575 |
- |
576 |
-@@ -1112,67 +1112,67 @@ MainPanel::process_key_event (wxKeyEvent &ev) |
577 |
- void MainPanel::intialize_keybindings () |
578 |
- { |
579 |
- |
580 |
-- _keyboard->add_action ("record", bind (mem_fun (*this, &MainPanel::command_action), wxT("record"))); |
581 |
-- _keyboard->add_action ("overdub", bind (mem_fun (*this, &MainPanel::command_action), wxT("overdub"))); |
582 |
-- _keyboard->add_action ("multiply", bind (mem_fun (*this, &MainPanel::command_action), wxT("multiply"))); |
583 |
-- _keyboard->add_action ("insert", bind (mem_fun (*this, &MainPanel::command_action), wxT("insert"))); |
584 |
-- _keyboard->add_action ("replace", bind (mem_fun (*this, &MainPanel::command_action), wxT("replace"))); |
585 |
-- _keyboard->add_action ("reverse", bind (mem_fun (*this, &MainPanel::command_action), wxT("reverse"))); |
586 |
-- _keyboard->add_action ("scratch", bind (mem_fun (*this, &MainPanel::command_action), wxT("scratch"))); |
587 |
-- _keyboard->add_action ("substitute", bind (mem_fun (*this, &MainPanel::command_action), wxT("substitute"))); |
588 |
-- _keyboard->add_action ("mute", bind (mem_fun (*this, &MainPanel::command_action), wxT("mute"))); |
589 |
-- _keyboard->add_action ("mute_on", bind (mem_fun (*this, &MainPanel::command_action), wxT("mute_on"))); |
590 |
-- _keyboard->add_action ("mute_off", bind (mem_fun (*this, &MainPanel::command_action), wxT("mute_off"))); |
591 |
-- _keyboard->add_action ("mute_trigger", bind (mem_fun (*this, &MainPanel::command_action), wxT("mute_trigger"))); |
592 |
-- _keyboard->add_action ("undo", bind (mem_fun (*this, &MainPanel::command_action), wxT("undo"))); |
593 |
-- _keyboard->add_action ("redo", bind (mem_fun (*this, &MainPanel::command_action), wxT("redo"))); |
594 |
-- _keyboard->add_action ("undo_all", bind (mem_fun (*this, &MainPanel::command_action), wxT("undo_all"))); |
595 |
-- _keyboard->add_action ("redo_all", bind (mem_fun (*this, &MainPanel::command_action), wxT("redo_all"))); |
596 |
-- _keyboard->add_action ("oneshot", bind (mem_fun (*this, &MainPanel::command_action), wxT("oneshot"))); |
597 |
-- _keyboard->add_action ("trigger", bind (mem_fun (*this, &MainPanel::command_action), wxT("trigger"))); |
598 |
-- _keyboard->add_action ("pause", bind (mem_fun (*this, &MainPanel::command_action), wxT("pause"))); |
599 |
-- _keyboard->add_action ("pause_on", bind (mem_fun (*this, &MainPanel::command_action), wxT("pause_on"))); |
600 |
-- _keyboard->add_action ("pause_off", bind (mem_fun (*this, &MainPanel::command_action), wxT("pause_off"))); |
601 |
-- _keyboard->add_action ("solo", bind (mem_fun (*this, &MainPanel::command_action), wxT("solo"))); |
602 |
-- _keyboard->add_action ("solo_prev", bind (mem_fun (*this, &MainPanel::command_action), wxT("solo_prev"))); |
603 |
-- _keyboard->add_action ("solo_next", bind (mem_fun (*this, &MainPanel::command_action), wxT("solo_next"))); |
604 |
-- _keyboard->add_action ("record_solo", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_solo"))); |
605 |
-- _keyboard->add_action ("record_solo_prev", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_solo_prev"))); |
606 |
-- _keyboard->add_action ("record_solo_next", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_solo_next"))); |
607 |
-- _keyboard->add_action ("set_sync_pos", bind (mem_fun (*this, &MainPanel::command_action), wxT("set_sync_pos"))); |
608 |
-- _keyboard->add_action ("reset_sync_pos", bind (mem_fun (*this, &MainPanel::command_action), wxT("reset_sync_pos"))); |
609 |
-- _keyboard->add_action ("record_or_overdub", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub"))); |
610 |
-- _keyboard->add_action ("record_exclusive", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_exclusive"))); |
611 |
-- _keyboard->add_action ("record_exclusive_next", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_exclusive_next"))); |
612 |
-- _keyboard->add_action ("record_exclusive_prev", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_exclusive_prev"))); |
613 |
-- _keyboard->add_action ("record_or_overdub_excl", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_excl"))); |
614 |
-- _keyboard->add_action ("record_or_overdub_excl_next", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_excl_next"))); |
615 |
-- _keyboard->add_action ("record_or_overdub_excl_prev", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_excl_prev"))); |
616 |
-- _keyboard->add_action ("record_or_overdub_solo", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_solo"))); |
617 |
-- _keyboard->add_action ("record_or_overdub_solo_next", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_solo_next"))); |
618 |
-- _keyboard->add_action ("record_or_overdub_solo_prev", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_solo_prev"))); |
619 |
-- _keyboard->add_action ("record_overdub_end_solo", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_overdub_end_solo"))); |
620 |
-- _keyboard->add_action ("record_overdub_end_solo_trig", bind (mem_fun (*this, &MainPanel::command_action), wxT("record_overdub_end_solo_trig"))); |
621 |
-+ _keyboard->add_action ("record", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record"))); |
622 |
-+ _keyboard->add_action ("overdub", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("overdub"))); |
623 |
-+ _keyboard->add_action ("multiply", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("multiply"))); |
624 |
-+ _keyboard->add_action ("insert", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("insert"))); |
625 |
-+ _keyboard->add_action ("replace", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("replace"))); |
626 |
-+ _keyboard->add_action ("reverse", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("reverse"))); |
627 |
-+ _keyboard->add_action ("scratch", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("scratch"))); |
628 |
-+ _keyboard->add_action ("substitute", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("substitute"))); |
629 |
-+ _keyboard->add_action ("mute", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("mute"))); |
630 |
-+ _keyboard->add_action ("mute_on", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("mute_on"))); |
631 |
-+ _keyboard->add_action ("mute_off", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("mute_off"))); |
632 |
-+ _keyboard->add_action ("mute_trigger", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("mute_trigger"))); |
633 |
-+ _keyboard->add_action ("undo", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("undo"))); |
634 |
-+ _keyboard->add_action ("redo", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("redo"))); |
635 |
-+ _keyboard->add_action ("undo_all", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("undo_all"))); |
636 |
-+ _keyboard->add_action ("redo_all", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("redo_all"))); |
637 |
-+ _keyboard->add_action ("oneshot", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("oneshot"))); |
638 |
-+ _keyboard->add_action ("trigger", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("trigger"))); |
639 |
-+ _keyboard->add_action ("pause", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("pause"))); |
640 |
-+ _keyboard->add_action ("pause_on", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("pause_on"))); |
641 |
-+ _keyboard->add_action ("pause_off", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("pause_off"))); |
642 |
-+ _keyboard->add_action ("solo", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("solo"))); |
643 |
-+ _keyboard->add_action ("solo_prev", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("solo_prev"))); |
644 |
-+ _keyboard->add_action ("solo_next", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("solo_next"))); |
645 |
-+ _keyboard->add_action ("record_solo", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_solo"))); |
646 |
-+ _keyboard->add_action ("record_solo_prev", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_solo_prev"))); |
647 |
-+ _keyboard->add_action ("record_solo_next", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_solo_next"))); |
648 |
-+ _keyboard->add_action ("set_sync_pos", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("set_sync_pos"))); |
649 |
-+ _keyboard->add_action ("reset_sync_pos", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("reset_sync_pos"))); |
650 |
-+ _keyboard->add_action ("record_or_overdub", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub"))); |
651 |
-+ _keyboard->add_action ("record_exclusive", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_exclusive"))); |
652 |
-+ _keyboard->add_action ("record_exclusive_next", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_exclusive_next"))); |
653 |
-+ _keyboard->add_action ("record_exclusive_prev", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_exclusive_prev"))); |
654 |
-+ _keyboard->add_action ("record_or_overdub_excl", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_excl"))); |
655 |
-+ _keyboard->add_action ("record_or_overdub_excl_next", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_excl_next"))); |
656 |
-+ _keyboard->add_action ("record_or_overdub_excl_prev", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_excl_prev"))); |
657 |
-+ _keyboard->add_action ("record_or_overdub_solo", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_solo"))); |
658 |
-+ _keyboard->add_action ("record_or_overdub_solo_next", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_solo_next"))); |
659 |
-+ _keyboard->add_action ("record_or_overdub_solo_prev", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_or_overdub_solo_prev"))); |
660 |
-+ _keyboard->add_action ("record_overdub_end_solo", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_overdub_end_solo"))); |
661 |
-+ _keyboard->add_action ("record_overdub_end_solo_trig", sigc::bind(mem_fun (*this, &MainPanel::command_action), wxT("record_overdub_end_solo_trig"))); |
662 |
- |
663 |
- |
664 |
-- _keyboard->add_action ("delay", bind (mem_fun (*this, &MainPanel::misc_action), wxT("delay"))); |
665 |
-- _keyboard->add_action ("taptempo", bind (mem_fun (*this, &MainPanel::misc_action), wxT("taptempo"))); |
666 |
-- _keyboard->add_action ("load", bind (mem_fun (*this, &MainPanel::misc_action), wxT("load"))); |
667 |
-- _keyboard->add_action ("save", bind (mem_fun (*this, &MainPanel::misc_action), wxT("save"))); |
668 |
-- _keyboard->add_action ("cancel_midi_learn", bind (mem_fun (*this, &MainPanel::misc_action), wxT("cancel_learn"))); |
669 |
-- |
670 |
-- _keyboard->add_action ("select_prev_loop", bind (mem_fun (*this, &MainPanel::select_loop_action), -2)); |
671 |
-- _keyboard->add_action ("select_next_loop", bind (mem_fun (*this, &MainPanel::select_loop_action), -1)); |
672 |
-- _keyboard->add_action ("select_loop_1", bind (mem_fun (*this, &MainPanel::select_loop_action), 1)); |
673 |
-- _keyboard->add_action ("select_loop_2", bind (mem_fun (*this, &MainPanel::select_loop_action), 2)); |
674 |
-- _keyboard->add_action ("select_loop_3", bind (mem_fun (*this, &MainPanel::select_loop_action), 3)); |
675 |
-- _keyboard->add_action ("select_loop_4", bind (mem_fun (*this, &MainPanel::select_loop_action), 4)); |
676 |
-- _keyboard->add_action ("select_loop_5", bind (mem_fun (*this, &MainPanel::select_loop_action), 5)); |
677 |
-- _keyboard->add_action ("select_loop_6", bind (mem_fun (*this, &MainPanel::select_loop_action), 6)); |
678 |
-- _keyboard->add_action ("select_loop_7", bind (mem_fun (*this, &MainPanel::select_loop_action), 7)); |
679 |
-- _keyboard->add_action ("select_loop_8", bind (mem_fun (*this, &MainPanel::select_loop_action), 8)); |
680 |
-- _keyboard->add_action ("select_loop_9", bind (mem_fun (*this, &MainPanel::select_loop_action), 9)); |
681 |
-- _keyboard->add_action ("select_loop_all", bind (mem_fun (*this, &MainPanel::select_loop_action), 0)); |
682 |
-+ _keyboard->add_action ("delay", sigc::bind(mem_fun (*this, &MainPanel::misc_action), wxT("delay"))); |
683 |
-+ _keyboard->add_action ("taptempo", sigc::bind(mem_fun (*this, &MainPanel::misc_action), wxT("taptempo"))); |
684 |
-+ _keyboard->add_action ("load", sigc::bind(mem_fun (*this, &MainPanel::misc_action), wxT("load"))); |
685 |
-+ _keyboard->add_action ("save", sigc::bind(mem_fun (*this, &MainPanel::misc_action), wxT("save"))); |
686 |
-+ _keyboard->add_action ("cancel_midi_learn", sigc::bind(mem_fun (*this, &MainPanel::misc_action), wxT("cancel_learn"))); |
687 |
-+ |
688 |
-+ _keyboard->add_action ("select_prev_loop", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), -2)); |
689 |
-+ _keyboard->add_action ("select_next_loop", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), -1)); |
690 |
-+ _keyboard->add_action ("select_loop_1", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 1)); |
691 |
-+ _keyboard->add_action ("select_loop_2", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 2)); |
692 |
-+ _keyboard->add_action ("select_loop_3", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 3)); |
693 |
-+ _keyboard->add_action ("select_loop_4", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 4)); |
694 |
-+ _keyboard->add_action ("select_loop_5", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 5)); |
695 |
-+ _keyboard->add_action ("select_loop_6", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 6)); |
696 |
-+ _keyboard->add_action ("select_loop_7", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 7)); |
697 |
-+ _keyboard->add_action ("select_loop_8", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 8)); |
698 |
-+ _keyboard->add_action ("select_loop_9", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 9)); |
699 |
-+ _keyboard->add_action ("select_loop_all", sigc::bind(mem_fun (*this, &MainPanel::select_loop_action), 0)); |
700 |
- |
701 |
- |
702 |
- // these are the defaults... they get overridden by rc file |
703 |
|
704 |
diff --git a/media-sound/sooperlooper/files/sooperlooper-1.7.3-libsigc28.patch b/media-sound/sooperlooper/files/sooperlooper-1.7.3-libsigc28.patch |
705 |
deleted file mode 100644 |
706 |
index 653303cfb55..00000000000 |
707 |
--- a/media-sound/sooperlooper/files/sooperlooper-1.7.3-libsigc28.patch |
708 |
+++ /dev/null |
709 |
@@ -1,124 +0,0 @@ |
710 |
-From 920443d3f7afb26f735f4002f3beed8766530d9b Mon Sep 17 00:00:00 2001 |
711 |
-From: vixus0 <vixus0@×××××.com> |
712 |
-Date: Tue, 7 Jun 2016 22:06:02 +0100 |
713 |
-Subject: [PATCH] Update libsigc++ trackable header import |
714 |
- |
715 |
-The `object.h` header was removed in libsigc++ 2.5.2 and `sigc::trackable` is now provided |
716 |
-in `trackable.h`. |
717 |
- |
718 |
-Original fix for Arch provided by AUR user sahquievaedoajie. |
719 |
---- |
720 |
- src/control_osc.hpp | 2 +- |
721 |
- src/gui/app_frame.hpp | 2 +- |
722 |
- src/gui/config_panel.hpp | 2 +- |
723 |
- src/gui/keys_panel.hpp | 2 +- |
724 |
- src/gui/latency_panel.hpp | 2 +- |
725 |
- src/gui/main_panel.hpp | 2 +- |
726 |
- src/gui/midi_bind_panel.hpp | 2 +- |
727 |
- src/gui/prefs_dialog.hpp | 2 +- |
728 |
- 8 files changed, 8 insertions(+), 8 deletions(-) |
729 |
- |
730 |
-diff --git a/src/control_osc.hpp b/src/control_osc.hpp |
731 |
-index 11b4e78..d83564f 100644 |
732 |
---- a/src/control_osc.hpp |
733 |
-+++ b/src/control_osc.hpp |
734 |
-@@ -27,7 +27,7 @@ |
735 |
- #include <list> |
736 |
- #include <utility> |
737 |
- |
738 |
--#include <sigc++/object.h> |
739 |
-+#include <sigc++/trackable.h> |
740 |
- |
741 |
- #include "event.hpp" |
742 |
- #include "event_nonrt.hpp" |
743 |
-diff --git a/src/gui/app_frame.hpp b/src/gui/app_frame.hpp |
744 |
-index e24ff92..36cc18f 100644 |
745 |
---- a/src/gui/app_frame.hpp |
746 |
-+++ b/src/gui/app_frame.hpp |
747 |
-@@ -26,7 +26,7 @@ |
748 |
- #include <string> |
749 |
- #include <vector> |
750 |
- |
751 |
--#include <sigc++/object.h> |
752 |
-+#include <sigc++/trackable.h> |
753 |
- #include <sigc++/signal.h> |
754 |
- #include <sigc++/connection.h> |
755 |
- |
756 |
-diff --git a/src/gui/config_panel.hpp b/src/gui/config_panel.hpp |
757 |
-index 2b413e9..46c849f 100644 |
758 |
---- a/src/gui/config_panel.hpp |
759 |
-+++ b/src/gui/config_panel.hpp |
760 |
-@@ -26,7 +26,7 @@ |
761 |
- |
762 |
- #include <string> |
763 |
- #include <vector> |
764 |
--#include <sigc++/object.h> |
765 |
-+#include <sigc++/trackable.h> |
766 |
- |
767 |
- class wxListCtrl; |
768 |
- class wxSpinCtrl; |
769 |
-diff --git a/src/gui/keys_panel.hpp b/src/gui/keys_panel.hpp |
770 |
-index b2c5955..c028c8f 100644 |
771 |
---- a/src/gui/keys_panel.hpp |
772 |
-+++ b/src/gui/keys_panel.hpp |
773 |
-@@ -26,7 +26,7 @@ |
774 |
- |
775 |
- #include <string> |
776 |
- #include <vector> |
777 |
--#include <sigc++/object.h> |
778 |
-+#include <sigc++/trackable.h> |
779 |
- |
780 |
- class wxListCtrl; |
781 |
- |
782 |
-diff --git a/src/gui/latency_panel.hpp b/src/gui/latency_panel.hpp |
783 |
-index 07dc30f..847da2b 100644 |
784 |
---- a/src/gui/latency_panel.hpp |
785 |
-+++ b/src/gui/latency_panel.hpp |
786 |
-@@ -26,7 +26,7 @@ |
787 |
- |
788 |
- #include <string> |
789 |
- #include <vector> |
790 |
--#include <sigc++/object.h> |
791 |
-+#include <sigc++/trackable.h> |
792 |
- |
793 |
- class wxListCtrl; |
794 |
- |
795 |
-diff --git a/src/gui/main_panel.hpp b/src/gui/main_panel.hpp |
796 |
-index 0b4ac7d..64cba4c 100644 |
797 |
---- a/src/gui/main_panel.hpp |
798 |
-+++ b/src/gui/main_panel.hpp |
799 |
-@@ -26,7 +26,7 @@ |
800 |
- #include <string> |
801 |
- #include <vector> |
802 |
- |
803 |
--#include <sigc++/object.h> |
804 |
-+#include <sigc++/trackable.h> |
805 |
- #include <sigc++/signal.h> |
806 |
- #include <sigc++/connection.h> |
807 |
- |
808 |
-diff --git a/src/gui/midi_bind_panel.hpp b/src/gui/midi_bind_panel.hpp |
809 |
-index e919cf2..0d05003 100644 |
810 |
---- a/src/gui/midi_bind_panel.hpp |
811 |
-+++ b/src/gui/midi_bind_panel.hpp |
812 |
-@@ -26,7 +26,7 @@ |
813 |
- |
814 |
- #include <string> |
815 |
- #include <vector> |
816 |
--#include <sigc++/object.h> |
817 |
-+#include <sigc++/trackable.h> |
818 |
- #include <list> |
819 |
- |
820 |
- #include <midi_bind.hpp> |
821 |
-diff --git a/src/gui/prefs_dialog.hpp b/src/gui/prefs_dialog.hpp |
822 |
-index ea59db1..29fee16 100644 |
823 |
---- a/src/gui/prefs_dialog.hpp |
824 |
-+++ b/src/gui/prefs_dialog.hpp |
825 |
-@@ -26,7 +26,7 @@ |
826 |
- |
827 |
- #include <string> |
828 |
- #include <vector> |
829 |
--#include <sigc++/object.h> |
830 |
-+#include <sigc++/trackable.h> |
831 |
- |
832 |
- class wxListCtrl; |
833 |
- class wxSpinCtrl; |
834 |
|
835 |
diff --git a/media-sound/sooperlooper/files/sooperlooper-1.7.3-tinfo.patch b/media-sound/sooperlooper/files/sooperlooper-1.7.3-tinfo.patch |
836 |
deleted file mode 100644 |
837 |
index 82694f46383..00000000000 |
838 |
--- a/media-sound/sooperlooper/files/sooperlooper-1.7.3-tinfo.patch |
839 |
+++ /dev/null |
840 |
@@ -1,22 +0,0 @@ |
841 |
-https://bugs.gentoo.org/683738 |
842 |
- |
843 |
-Thanks-to: Jeroen Roovers <jer@g.o> |
844 |
- |
845 |
---- a/configure.ac |
846 |
-+++ b/configure.ac |
847 |
-@@ -214,10 +216,11 @@ |
848 |
- AC_SUBST(LOSC_CFLAGS) |
849 |
- |
850 |
- dnl curses |
851 |
-- AC_CHECK_LIB(ncurses,initscr,have_ncurses=yes,[AC_MSG_WARN([******** you don't have the ncurses library correctly installed])]) |
852 |
-- |
853 |
-- NCURSES_LIBS=-lncurses |
854 |
-- AC_SUBST(NCURSES_LIBS) |
855 |
-+ PKG_CHECK_MODULES([NCURSES], [ncurses], [have_ncurses=yes], |
856 |
-+ AC_CHECK_LIB(ncurses, initscr, have_ncurses=yes, |
857 |
-+ [AC_MSG_WARN([******** you don't have the ncurses library correctly installed])] |
858 |
-+ ) |
859 |
-+ ) |
860 |
- |
861 |
- dnl sigc++ |
862 |
- PKG_CHECK_MODULES(SIGCPP, sigc++-2.0 >= 2.2.10) |
863 |
|
864 |
diff --git a/media-sound/sooperlooper/files/sooperlooper-1.7.3-wx3.0.patch b/media-sound/sooperlooper/files/sooperlooper-1.7.3-wx3.0.patch |
865 |
deleted file mode 100644 |
866 |
index fee40e8f98b..00000000000 |
867 |
--- a/media-sound/sooperlooper/files/sooperlooper-1.7.3-wx3.0.patch |
868 |
+++ /dev/null |
869 |
@@ -1,177 +0,0 @@ |
870 |
-Author: Jaromír Mikeš <mira.mikes@××××××.cz>, Olly Betts <olly@××××××.com> |
871 |
-Description: build against wx 3.0. |
872 |
-Forwarded: yes |
873 |
- |
874 |
-Index: sooperlooper/src/gui/main_panel.cpp |
875 |
-=================================================================== |
876 |
---- sooperlooper.orig/src/gui/main_panel.cpp |
877 |
-+++ sooperlooper/src/gui/main_panel.cpp |
878 |
-@@ -448,7 +448,7 @@ MainPanel::init_loopers (int count) |
879 |
- while (count < (int)_looper_panels.size()) { |
880 |
- looperpan = _looper_panels.back(); |
881 |
- _looper_panels.pop_back(); |
882 |
-- _main_sizer->Remove(looperpan); |
883 |
-+ _main_sizer->Detach(looperpan); |
884 |
- looperpan->Destroy(); |
885 |
- } |
886 |
- } |
887 |
-@@ -1277,7 +1277,7 @@ void MainPanel::misc_action (bool releas |
888 |
- } |
889 |
- |
890 |
- |
891 |
-- wxString filename = do_file_selector (wxT("Choose file to save loop"), wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"), wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT); |
892 |
-+ wxString filename = do_file_selector (wxT("Choose file to save loop"), wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"), wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT); |
893 |
- |
894 |
- if ( !filename.empty() ) |
895 |
- { |
896 |
-@@ -1296,7 +1296,7 @@ void MainPanel::misc_action (bool releas |
897 |
- index = 0; |
898 |
- } |
899 |
- |
900 |
-- wxString filename = do_file_selector (wxT("Choose file to open"), wxT(""), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR); |
901 |
-+ wxString filename = do_file_selector (wxT("Choose file to open"), wxT(""), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR); |
902 |
- |
903 |
- if ( !filename.empty() ) |
904 |
- { |
905 |
-@@ -1408,7 +1408,7 @@ void MainPanel::set_curr_loop (int index |
906 |
- |
907 |
- void MainPanel::do_load_session () |
908 |
- { |
909 |
-- wxString filename = do_file_selector (wxT("Choose session to load"), wxT("*.slsess"), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR); |
910 |
-+ wxString filename = do_file_selector (wxT("Choose session to load"), wxT("*.slsess"), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR); |
911 |
- |
912 |
- if ( !filename.empty() ) |
913 |
- { |
914 |
-@@ -1419,7 +1419,7 @@ void MainPanel::do_load_session () |
915 |
- |
916 |
- void MainPanel::do_save_session (bool write_audio) |
917 |
- { |
918 |
-- wxString filename = do_file_selector (wxT("Choose file to save session"), wxT("slsess"), wxT("*.slsess"), wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT); |
919 |
-+ wxString filename = do_file_selector (wxT("Choose file to save session"), wxT("slsess"), wxT("*.slsess"), wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT); |
920 |
- |
921 |
- if ( !filename.empty() ) |
922 |
- { |
923 |
-Index: sooperlooper/src/gui/pix_button.cpp |
924 |
-=================================================================== |
925 |
---- sooperlooper.orig/src/gui/pix_button.cpp |
926 |
-+++ sooperlooper/src/gui/pix_button.cpp |
927 |
-@@ -250,7 +250,7 @@ PixButton::OnMouseEvents (wxMouseEvent & |
928 |
- pt.x += bounds.x; |
929 |
- pt.y += bounds.y; |
930 |
- |
931 |
-- if (bounds.Inside(pt)) { |
932 |
-+ if (bounds.Contains(pt)) { |
933 |
- clicked (get_mouse_button(ev)); // emit |
934 |
- |
935 |
- if (ev.MiddleUp() && ev.ControlDown()) { |
936 |
-Index: sooperlooper/src/gui/looper_panel.cpp |
937 |
-=================================================================== |
938 |
---- sooperlooper.orig/src/gui/looper_panel.cpp |
939 |
-+++ sooperlooper/src/gui/looper_panel.cpp |
940 |
-@@ -1428,7 +1428,7 @@ LooperPanel::clicked_events (int button, |
941 |
- if (cmd == wxT("save")) |
942 |
- { |
943 |
- wxString filename = _mainpanel->do_file_selector (wxT("Choose file to save loop"), |
944 |
-- wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"), wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT); |
945 |
-+ wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"), wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT); |
946 |
- |
947 |
- if ( !filename.empty() ) |
948 |
- { |
949 |
-@@ -1442,7 +1442,7 @@ LooperPanel::clicked_events (int button, |
950 |
- } |
951 |
- else if (cmd == wxT("load")) |
952 |
- { |
953 |
-- wxString filename = _mainpanel->do_file_selector(wxT("Choose file to open"), wxT(""), wxT("Audio files (*.wav,*.aif)|*.wav;*.WAV;*.Wav;*.aif;*.aiff;*.AIF;*.AIFF|All files (*.*)|*.*"), wxOPEN|wxCHANGE_DIR); |
954 |
-+ wxString filename = _mainpanel->do_file_selector(wxT("Choose file to open"), wxT(""), wxT("Audio files (*.wav,*.aif)|*.wav;*.WAV;*.Wav;*.aif;*.aiff;*.AIF;*.AIFF|All files (*.*)|*.*"), wxFD_OPEN|wxFD_CHANGE_DIR); |
955 |
- |
956 |
- if ( !filename.empty() ) |
957 |
- { |
958 |
-Index: sooperlooper/src/gui/keyboard_target.cpp |
959 |
-=================================================================== |
960 |
---- sooperlooper.orig/src/gui/keyboard_target.cpp |
961 |
-+++ sooperlooper/src/gui/keyboard_target.cpp |
962 |
-@@ -553,10 +553,10 @@ KeyboardTarget::keycode_from_name (const |
963 |
- keycode = WXK_RETURN; |
964 |
- } |
965 |
- else if ( keyname == wxT("PGUP") ) { |
966 |
-- keycode = WXK_PRIOR; |
967 |
-+ keycode = WXK_PAGEUP; |
968 |
- } |
969 |
- else if ( keyname == wxT("PGDN") ) { |
970 |
-- keycode = WXK_NEXT; |
971 |
-+ keycode = WXK_PAGEDOWN; |
972 |
- } |
973 |
- else if ( keyname == wxT("LEFT") ) { |
974 |
- keycode = WXK_LEFT; |
975 |
-@@ -630,10 +630,10 @@ wxString KeyboardTarget::name_from_keyco |
976 |
- case WXK_RETURN: |
977 |
- text += wxT("return"); |
978 |
- break; |
979 |
-- case WXK_PRIOR: |
980 |
-+ case WXK_PAGEUP: |
981 |
- text += wxT("pageup"); |
982 |
- break; |
983 |
-- case WXK_NEXT: |
984 |
-+ case WXK_PAGEDOWN: |
985 |
- text += wxT("pagedown"); |
986 |
- break; |
987 |
- case WXK_LEFT: |
988 |
-Index: sooperlooper/src/gui/check_box.cpp |
989 |
-=================================================================== |
990 |
---- sooperlooper.orig/src/gui/check_box.cpp |
991 |
-+++ sooperlooper/src/gui/check_box.cpp |
992 |
-@@ -237,7 +237,7 @@ CheckBox::OnMouseEvents (wxMouseEvent &e |
993 |
- } |
994 |
- else if (ev.LeftUp()) |
995 |
- { |
996 |
-- if (bounds.Inside(ev.GetPosition())) { |
997 |
-+ if (bounds.Contains(ev.GetPosition())) { |
998 |
- // toggle value |
999 |
- _value = !_value; |
1000 |
- |
1001 |
-Index: sooperlooper/src/gui/midi_bind_panel.cpp |
1002 |
-=================================================================== |
1003 |
---- sooperlooper.orig/src/gui/midi_bind_panel.cpp |
1004 |
-+++ sooperlooper/src/gui/midi_bind_panel.cpp |
1005 |
-@@ -880,7 +880,7 @@ void MidiBindPanel::on_button (wxCommand |
1006 |
- } |
1007 |
- else if (ev.GetId() == ID_LoadButton) |
1008 |
- { |
1009 |
-- wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to open"), wxT(""), wxT("*.slb"), wxOPEN|wxCHANGE_DIR); |
1010 |
-+ wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to open"), wxT(""), wxT("*.slb"), wxFD_OPEN|wxFD_CHANGE_DIR); |
1011 |
- if ( !filename.empty() ) |
1012 |
- { |
1013 |
- _parent->get_loop_control().load_midi_bindings(filename, _append_check->GetValue()); |
1014 |
-@@ -888,7 +888,7 @@ void MidiBindPanel::on_button (wxCommand |
1015 |
- } |
1016 |
- else if (ev.GetId() == ID_SaveButton) |
1017 |
- { |
1018 |
-- wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to save"), wxT(""), wxT("*.slb"), wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT); |
1019 |
-+ wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to save"), wxT(""), wxT("*.slb"), wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT); |
1020 |
- |
1021 |
- if ( !filename.empty() ) |
1022 |
- { |
1023 |
-Index: sooperlooper/src/gui/config_panel.cpp |
1024 |
-=================================================================== |
1025 |
---- sooperlooper.orig/src/gui/config_panel.cpp |
1026 |
-+++ sooperlooper/src/gui/config_panel.cpp |
1027 |
-@@ -378,7 +378,7 @@ void ConfigPanel::on_button (wxCommandEv |
1028 |
- else if (ev.GetId() == ID_MidiBrowseButton) { |
1029 |
- |
1030 |
- _parent->get_keyboard().set_enabled(false); |
1031 |
-- wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to use"), wxT(""), wxT("*.slb"), wxOPEN|wxCHANGE_DIR); |
1032 |
-+ wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to use"), wxT(""), wxT("*.slb"), wxFD_OPEN|wxFD_CHANGE_DIR); |
1033 |
- _parent->get_keyboard().set_enabled(true); |
1034 |
- |
1035 |
- if ( !filename.empty() ) |
1036 |
-@@ -389,8 +389,8 @@ void ConfigPanel::on_button (wxCommandEv |
1037 |
- else if (ev.GetId() == ID_SessionBrowseButton) { |
1038 |
- |
1039 |
- _parent->get_keyboard().set_enabled(false); |
1040 |
-- wxString filename = _parent->do_file_selector(wxT("Choose session file to use"), wxT(""), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR); |
1041 |
-- //wxString filename = wxFileSelector(wxT("Choose session file to use"), wxT(""), wxT(""), wxT(""), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR); |
1042 |
-+ wxString filename = _parent->do_file_selector(wxT("Choose session file to use"), wxT(""), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR); |
1043 |
-+ //wxString filename = wxFileSelector(wxT("Choose session file to use"), wxT(""), wxT(""), wxT(""), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR); |
1044 |
- _parent->get_keyboard().set_enabled(true); |
1045 |
- |
1046 |
- if ( !filename.empty() ) |
1047 |
|
1048 |
diff --git a/media-sound/sooperlooper/sooperlooper-1.7.3-r2.ebuild b/media-sound/sooperlooper/sooperlooper-1.7.4.ebuild |
1049 |
similarity index 64% |
1050 |
rename from media-sound/sooperlooper/sooperlooper-1.7.3-r2.ebuild |
1051 |
rename to media-sound/sooperlooper/sooperlooper-1.7.4.ebuild |
1052 |
index 62c837de9ed..3e5a9107cf3 100644 |
1053 |
--- a/media-sound/sooperlooper/sooperlooper-1.7.3-r2.ebuild |
1054 |
+++ b/media-sound/sooperlooper/sooperlooper-1.7.4.ebuild |
1055 |
@@ -1,10 +1,10 @@ |
1056 |
-# Copyright 1999-2019 Gentoo Authors |
1057 |
+# Copyright 1999-2020 Gentoo Authors |
1058 |
# Distributed under the terms of the GNU General Public License v2 |
1059 |
|
1060 |
-EAPI=6 |
1061 |
-WX_GTK_VER=3.0 |
1062 |
+EAPI=7 |
1063 |
+WX_GTK_VER=3.0-gtk3 |
1064 |
|
1065 |
-inherit autotools flag-o-matic wxwidgets toolchain-funcs |
1066 |
+inherit autotools flag-o-matic wxwidgets toolchain-funcs desktop xdg |
1067 |
|
1068 |
DESCRIPTION="Live looping sampler with immediate loop recording" |
1069 |
HOMEPAGE="http://essej.net/sooperlooper/index.html" |
1070 |
@@ -17,32 +17,26 @@ SLOT="0" |
1071 |
KEYWORDS="~amd64 ~ppc ~x86" |
1072 |
IUSE="wxwidgets" |
1073 |
|
1074 |
+BDEPEND=" |
1075 |
+ virtual/pkgconfig |
1076 |
+" |
1077 |
RDEPEND=" |
1078 |
- media-sound/jack-audio-connection-kit |
1079 |
- >=media-libs/liblo-0.10 |
1080 |
- >=dev-libs/libsigc++-2.8:2 |
1081 |
- >=media-libs/libsndfile-1.0.2 |
1082 |
- >=media-libs/libsamplerate-0.0.13 |
1083 |
+ media-libs/liblo |
1084 |
+ dev-libs/libsigc++:2 |
1085 |
+ media-libs/libsndfile |
1086 |
+ media-libs/libsamplerate |
1087 |
dev-libs/libxml2:2 |
1088 |
- >=media-libs/rubberband-0.0.13 |
1089 |
+ media-libs/rubberband |
1090 |
sci-libs/fftw:3.0= |
1091 |
+ virtual/jack |
1092 |
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} ) |
1093 |
" |
1094 |
-DEPEND="${RDEPEND} |
1095 |
- virtual/pkgconfig |
1096 |
-" |
1097 |
+DEPEND="${RDEPEND}" |
1098 |
|
1099 |
S="${WORKDIR}/${P/_p*}" |
1100 |
|
1101 |
DOCS=( OSC README ) |
1102 |
|
1103 |
-PATCHES=( |
1104 |
- "${FILESDIR}"/${P}-wx3.0.patch |
1105 |
- "${FILESDIR}"/${P}-libsigc28.patch |
1106 |
- "${FILESDIR}"/${P}-clash.patch |
1107 |
- "${FILESDIR}"/${P}-tinfo.patch |
1108 |
-) |
1109 |
- |
1110 |
src_prepare() { |
1111 |
default |
1112 |
cp -rf "${WORKDIR}"/aclocal "${S}" || die "copying aclocal failed" |
1113 |
@@ -50,7 +44,7 @@ src_prepare() { |
1114 |
} |
1115 |
|
1116 |
src_configure() { |
1117 |
- use wxwidgets && need-wxwidgets unicode |
1118 |
+ use wxwidgets && setup-wxwidgets |
1119 |
append-cppflags -std=c++11 # Its ugly build system honors CPPFLAGS instead of CXXFLAGS for this |
1120 |
econf \ |
1121 |
$(use_with wxwidgets gui) \ |
1122 |
@@ -61,3 +55,9 @@ src_configure() { |
1123 |
src_compile() { |
1124 |
emake AR="$(tc-getAR)" |
1125 |
} |
1126 |
+ |
1127 |
+src_install() { |
1128 |
+ default |
1129 |
+ |
1130 |
+ use wxwidgets && make_desktop_entry /usr/bin/slgui SooperLooper |
1131 |
+} |