1 |
commit: eabc974147a52d828a696bbe7736e6a84b0ee245 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Aug 7 18:44:10 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 7 23:23:24 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eabc9741 |
7 |
|
8 |
kde-apps/minuet: remove unused patch(es) |
9 |
|
10 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
.../minuet/files/minuet-19.08.3-fluidsynth-2.patch | 94 ---------------------- |
15 |
1 file changed, 94 deletions(-) |
16 |
|
17 |
diff --git a/kde-apps/minuet/files/minuet-19.08.3-fluidsynth-2.patch b/kde-apps/minuet/files/minuet-19.08.3-fluidsynth-2.patch |
18 |
deleted file mode 100644 |
19 |
index 9bb3c5bad1b..00000000000 |
20 |
--- a/kde-apps/minuet/files/minuet-19.08.3-fluidsynth-2.patch |
21 |
+++ /dev/null |
22 |
@@ -1,94 +0,0 @@ |
23 |
-From d707ab85c60d68e0310559df4608d86680cc811a Mon Sep 17 00:00:00 2001 |
24 |
-From: Tom Moebert <tom.mbrt@××××××××××.com> |
25 |
-Date: Sat, 18 Jan 2020 00:26:30 +0100 |
26 |
-Subject: Port to fluidsynth 2.0.0 API |
27 |
- |
28 |
-Summary: |
29 |
-This includes necessary adaptations for fluidsynth 2.0. All changes are backward-compatible to fluidsynth 1.1. For details, see: |
30 |
- |
31 |
-http://www.fluidsynth.org/api/index.html#NewIn2_0_0 |
32 |
- |
33 |
-Reviewers: #minuet |
34 |
- |
35 |
-Subscribers: asturmlechner, aacid, kde-edu |
36 |
- |
37 |
-Tags: #minuet, #kde_edu |
38 |
- |
39 |
-Differential Revision: https://phabricator.kde.org/D26558 |
40 |
---- |
41 |
- .../fluidsynthsoundcontroller.cpp | 22 ++++++++++++++++++---- |
42 |
- .../fluidsynthsoundcontroller.h | 1 + |
43 |
- 2 files changed, 19 insertions(+), 4 deletions(-) |
44 |
- |
45 |
-diff --git a/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.cpp b/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.cpp |
46 |
-index 67e6826..7252914 100644 |
47 |
---- a/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.cpp |
48 |
-+++ b/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.cpp |
49 |
-@@ -34,13 +34,14 @@ FluidSynthSoundController::FluidSynthSoundController(QObject *parent) |
50 |
- : Minuet::ISoundController(parent), |
51 |
- m_audioDriver(0), |
52 |
- m_sequencer(0), |
53 |
-- m_song(0) |
54 |
-+ m_song(0), |
55 |
-+ m_unregisteringEvent(0) |
56 |
- { |
57 |
- m_tempo = 60; |
58 |
- |
59 |
- m_settings = new_fluid_settings(); |
60 |
-- fluid_settings_setstr(m_settings, "synth.reverb.active", "no"); |
61 |
-- fluid_settings_setstr(m_settings, "synth.chorus.active", "no"); |
62 |
-+ fluid_settings_setint(m_settings, "synth.reverb.active", 0); |
63 |
-+ fluid_settings_setint(m_settings, "synth.chorus.active", 0); |
64 |
- |
65 |
- m_synth = new_fluid_synth(m_settings); |
66 |
- |
67 |
-@@ -55,6 +56,9 @@ FluidSynthSoundController::FluidSynthSoundController(QObject *parent) |
68 |
- if (fluid_res == FLUID_FAILED) |
69 |
- qCritical() << "Error when loading soundfont!"; |
70 |
- |
71 |
-+ m_unregisteringEvent = new_fluid_event(); |
72 |
-+ fluid_event_set_source(m_unregisteringEvent, -1); |
73 |
-+ |
74 |
- resetEngine(); |
75 |
- } |
76 |
- |
77 |
-@@ -63,6 +67,7 @@ FluidSynthSoundController::~FluidSynthSoundController() |
78 |
- deleteEngine(); |
79 |
- if (m_synth) delete_fluid_synth(m_synth); |
80 |
- if (m_settings) delete_fluid_settings(m_settings); |
81 |
-+ if (m_unregisteringEvent) delete_fluid_event(m_unregisteringEvent); |
82 |
- } |
83 |
- |
84 |
- void FluidSynthSoundController::setPitch(qint8 pitch) |
85 |
-@@ -240,7 +245,16 @@ void FluidSynthSoundController::resetEngine() |
86 |
- |
87 |
- void FluidSynthSoundController::deleteEngine() |
88 |
- { |
89 |
-- if (m_sequencer) delete_fluid_sequencer(m_sequencer); |
90 |
-+ if (m_sequencer) { |
91 |
-+#if FLUIDSYNTH_VERSION_MAJOR >= 2 |
92 |
-+ // explicit client unregistering required |
93 |
-+ fluid_sequencer_unregister_client(m_sequencer, m_callbackSeqID); |
94 |
-+ fluid_event_set_dest(m_unregisteringEvent, m_synthSeqID); |
95 |
-+ fluid_event_unregistering(m_unregisteringEvent); |
96 |
-+ fluid_sequencer_send_now(m_sequencer, m_unregisteringEvent); |
97 |
-+#endif |
98 |
-+ delete_fluid_sequencer(m_sequencer); |
99 |
-+ } |
100 |
- if (m_audioDriver) delete_fluid_audio_driver(m_audioDriver); |
101 |
- } |
102 |
- |
103 |
-diff --git a/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.h b/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.h |
104 |
-index afad46b..ed111c2 100644 |
105 |
---- a/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.h |
106 |
-+++ b/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.h |
107 |
-@@ -63,6 +63,7 @@ private: |
108 |
- fluid_audio_driver_t *m_audioDriver; |
109 |
- fluid_sequencer_t *m_sequencer; |
110 |
- fluid_synth_t *m_synth; |
111 |
-+ fluid_event_t *m_unregisteringEvent; |
112 |
- |
113 |
- short m_synthSeqID; |
114 |
- short m_callbackSeqID; |
115 |
--- |
116 |
-cgit v1.1 |