Fixup merge error
This commit is contained in:
@@ -174,7 +174,6 @@ public:
|
||||
bool captureDeviceAvailable() const;
|
||||
|
||||
|
||||
|
||||
// audio-bus-handle-stuff
|
||||
inline void addAudioBusHandle(AudioBusHandle* busHandle)
|
||||
{
|
||||
@@ -361,11 +360,6 @@ private:
|
||||
return m_audioDev;
|
||||
}
|
||||
|
||||
const AudioDevice* audioDev() const
|
||||
{
|
||||
return m_audioDev;
|
||||
}
|
||||
|
||||
void renderStageNoteSetup();
|
||||
void renderStageInstruments();
|
||||
void renderStageEffects();
|
||||
|
||||
Reference in New Issue
Block a user