Mercurial > hg > svapp
comparison framework/MainWindowBase.h @ 304:c837368b1faf
Remove OSC option from constructor -- call startOSCQueue() after construction if you want it.
This needs to be handled this way in SV because we need to ask for network permission before opening the OSC port (that's the thing that gets the app blocked by e.g. Windows Firewall).
author | Chris Cannam |
---|---|
date | Thu, 12 Dec 2013 15:20:14 +0000 |
parents | 2925a4bbca5e |
children | b3609adae921 |
comparison
equal
deleted
inserted
replaced
300:47964f188bd9 | 304:c837368b1faf |
---|---|
73 class MainWindowBase : public QMainWindow, public FrameTimer | 73 class MainWindowBase : public QMainWindow, public FrameTimer |
74 { | 74 { |
75 Q_OBJECT | 75 Q_OBJECT |
76 | 76 |
77 public: | 77 public: |
78 MainWindowBase(bool withAudioOutput, bool withOSCSupport, bool withMIDIInput); | 78 MainWindowBase(bool withAudioOutput, bool withMIDIInput); |
79 virtual ~MainWindowBase(); | 79 virtual ~MainWindowBase(); |
80 | 80 |
81 enum AudioFileOpenMode { | 81 enum AudioFileOpenMode { |
82 ReplaceSession, | 82 ReplaceSession, |
83 ReplaceMainModel, | 83 ReplaceMainModel, |
307 MainWindowBase *m_mwb; | 307 MainWindowBase *m_mwb; |
308 }; | 308 }; |
309 | 309 |
310 OSCQueue *m_oscQueue; | 310 OSCQueue *m_oscQueue; |
311 OSCQueueStarter *m_oscQueueStarter; | 311 OSCQueueStarter *m_oscQueueStarter; |
312 void startOSCQueue(); | |
312 | 313 |
313 MIDIInput *m_midiInput; | 314 MIDIInput *m_midiInput; |
314 | 315 |
315 RecentFiles m_recentFiles; | 316 RecentFiles m_recentFiles; |
316 RecentFiles m_recentTransforms; | 317 RecentFiles m_recentTransforms; |