Skip to content

Commit 5e14831

Browse files
committed
BackendManager fix
1 parent 00e006c commit 5e14831

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

guiplayer.cpp

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,15 @@ void GUIPlayer::connectOutPort()
5858
}
5959

6060
GUIPlayer::GUIPlayer(QWidget *parent)
61-
: QMainWindow(parent),
62-
m_state(InvalidState),
63-
m_repeat(Nothing),
64-
m_midiOut(nullptr),
65-
m_player(nullptr),
66-
m_ui(new Ui::GUIPlayerClass),
67-
m_pd(nullptr),
68-
m_currentLang(nullptr)
61+
: QMainWindow(parent)
62+
, m_state(InvalidState)
63+
, m_repeat(Nothing)
64+
, m_manager{new BackendManager}
65+
, m_midiOut{nullptr}
66+
, m_player{nullptr}
67+
, m_ui{new Ui::GUIPlayerClass}
68+
, m_pd{nullptr}
69+
, m_currentLang{nullptr}
6970
{
7071
m_ui->setupUi(this);
7172
setAcceptDrops(true);
@@ -180,14 +181,13 @@ GUIPlayer::GUIPlayer(QWidget *parent)
180181
m_ui->lblTime->setFont(lblTimeFont);
181182

182183
try {
183-
BackendManager man;
184-
man.refresh(Settings::instance()->settingsMap());
185-
QList<MIDIOutput*> outputs = man.availableOutputs();
184+
m_manager->refresh(Settings::instance()->settingsMap());
185+
QList<MIDIOutput *> outputs = m_manager->availableOutputs();
186186
if (outputs.isEmpty()) {
187187
qWarning() << "MIDI OUT drivers missing. Perhaps you need to set a DRUMSTICKRT environment variable?";
188188
}
189189

190-
m_midiOut = man.findOutput(Settings::instance()->lastOutputBackend());
190+
m_midiOut = m_manager->findOutput(Settings::instance()->lastOutputBackend());
191191
if (m_midiOut == nullptr) {
192192
qWarning() << "MIDI OUT driver not found. Perhaps you need to set a DRUMSTICKRT environment variable?";
193193
}
@@ -244,6 +244,7 @@ GUIPlayer::~GUIPlayer()
244244
delete m_player;
245245
}
246246
delete m_ui;
247+
delete m_manager;
247248
}
248249

249250
void GUIPlayer::updateTimeLabel(std::chrono::milliseconds millis)

guiplayer.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,12 @@
4646
class MIDIEvent;
4747

4848
namespace drumstick { namespace rt {
49-
class MIDIOutput;
49+
class BackendManager;
50+
class MIDIOutput;
5051
}}
5152

5253
namespace Ui {
53-
class GUIPlayerClass;
54+
class GUIPlayerClass;
5455
}
5556

5657
class SequencePlayer;
@@ -173,8 +174,9 @@ public slots:
173174

174175
PlayerState m_state;
175176
PlaylistRepetition m_repeat;
176-
drumstick::rt::MIDIOutput* m_midiOut;
177-
SequencePlayer* m_player;
177+
drumstick::rt::BackendManager *m_manager;
178+
drumstick::rt::MIDIOutput *m_midiOut;
179+
SequencePlayer *m_player;
178180
Ui::GUIPlayerClass* m_ui;
179181
QPointer<QProgressDialog> m_pd;
180182
QThread m_playerThread;

0 commit comments

Comments
 (0)