Fixed compiling with the renamed files GrandOrgue#703

oleg68 · Nov 29, 2021 · 824400b · 824400b
1 parent ec81961
commit 824400b
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/src/grandorgue/CMakeLists.txt b/src/grandorgue/CMakeLists.txt
@@ -91,11 +91,11 @@ GOLabel.cpp
 GOManual.cpp
 GOMetronome.cpp
 GOMainWindowData.cpp
-midi/ports/GOMidiFactory.cpp
+midi/ports/GOMidiPortFactory.cpp
 midi/ports/GOMidiInPort.cpp
 midi/ports/GOMidiOutPort.cpp
 midi/ports/GOMidiPort.cpp
-midi/ports/GOMidiRtFactory.cpp
+midi/ports/GOMidiRtPortFactory.cpp
 midi/ports/GOMidiRtInPort.cpp
 midi/ports/GOMidiRtOutPort.cpp
 midi/GOMidi.cpp
@@ -126,7 +126,7 @@ sound/GOSound.cpp
 sound/ports/GOSoundJackPort.cpp
 sound/ports/GOSoundPort.cpp
 sound/ports/GOSoundPortaudioPort.cpp
-sound/ports/GOSoundPortsConfig.cpp
+settings/GOPortsConfig.cpp
 sound/ports/GOSoundRtPort.cpp
 GOSoundingPipe.cpp
 GOSplash.cpp

diff --git a/src/grandorgue/midi/GOMidi.h b/src/grandorgue/midi/GOMidi.h
@@ -11,7 +11,7 @@
 
 #include <wx/event.h>
 
-#include "ports/GOMidiFactory.h"
+#include "ports/GOMidiPortFactory.h"
 
 class GOMidiEvent;
 class GOMidiInPort;

diff --git a/src/grandorgue/midi/ports/GOMidiPortFactory.cpp b/src/grandorgue/midi/ports/GOMidiPortFactory.cpp
@@ -4,7 +4,7 @@
 * License GPL-2.0 or later (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
 */
 
-#include "GOMidiFactory.h"
+#include "GOMidiPortFactory.h"
 
 void GOMidiFactory::addMissingInDevices(GOMidi* midi, ptr_vector<GOMidiInPort>& ports)
 {

diff --git a/src/grandorgue/midi/ports/GOMidiPortFactory.h b/src/grandorgue/midi/ports/GOMidiPortFactory.h
@@ -11,7 +11,7 @@
 
 #include "GOMidiInPort.h"
 #include "GOMidiOutPort.h"
-#include "GOMidiRtFactory.h"
+#include "GOMidiRtPortFactory.h"
 
 class GOMidi;
 

diff --git a/src/grandorgue/midi/ports/GOMidiRtPortFactory.cpp b/src/grandorgue/midi/ports/GOMidiRtPortFactory.cpp
@@ -4,7 +4,7 @@
 * License GPL-2.0 or later (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
 */
 
-#include "GOMidiRtFactory.h"
+#include "GOMidiRtPortFactory.h"
 #include "GOMidiRtInPort.h"
 #include "GOMidiRtOutPort.h"
 

diff --git a/src/grandorgue/settings/GOPortsConfig.cpp b/src/grandorgue/settings/GOPortsConfig.cpp
@@ -1,4 +1,4 @@
-#include "GOSoundPortsConfig.h"
+#include "GOPortsConfig.h"
 
 int GOSoundPortsConfig::Find(
   const wxString &portName, const wxString &apiName

diff --git a/src/grandorgue/settings/GOSettings.h b/src/grandorgue/settings/GOSettings.h
@@ -20,7 +20,7 @@
 #include "settings/GOSettingString.h"
 #include "settings/GOSettingStore.h"
 #include "settings/GOSettingString.h"
-#include "sound/ports/GOSoundPortsConfig.h"
+#include "GOPortsConfig.h"
 #include "ptrvector.h"
 #include <wx/gdicmn.h>
 #include <wx/string.h>

diff --git a/src/grandorgue/settings/SettingsAudioOutput.h b/src/grandorgue/settings/SettingsAudioOutput.h
@@ -17,7 +17,7 @@
 #include <wx/treelist.h>
 
 #include "sound/GOSoundDevInfo.h"
-#include "sound/ports/GOSoundPortsConfig.h"
+#include "GOPortsConfig.h"
 #include "SettingsAudioGroup.h"
 
 class AudioItemData;

diff --git a/src/grandorgue/sound/GOSound.h b/src/grandorgue/sound/GOSound.h
@@ -12,7 +12,7 @@
 #include "GOSoundRecorder.h"
 #include "midi/GOMidi.h"
 #include "GOSoundDevInfo.h"
-#include "ports/GOSoundPortsConfig.h"
+#include "settings/GOPortsConfig.h"
 
 #include "threading/atomic.h"
 #include "threading/GOMutex.h"

diff --git a/src/grandorgue/sound/ports/GOSoundPort.h b/src/grandorgue/sound/ports/GOSoundPort.h
@@ -8,7 +8,7 @@
 #define GOSOUNDPORT_H
 
 #include "sound/GOSoundDevInfo.h"
-#include "GOSoundPortsConfig.h"
+#include "settings/GOPortsConfig.h"
 
 #include <wx/string.h>
 #include <vector>