Skip to content

Commit

Permalink
[Ref] openmpt/streamencoder: Untangle StreamEncoder dependencies and …
Browse files Browse the repository at this point in the history 
…move to openmpt/streamencoder/.

git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@21586 56274372-70c3-4bfc-bfc3-4c3a0b034d27
  • Loading branch information
@manxorist
manxorist committed Sep 13, 2024
1 parent fd8d227 commit d8d517b
Show file tree
Hide file tree
Showing 95 changed files with 2,794 additions and 2,533 deletions.
2 changes: 2 additions & 0 deletions build/premake-xcode/mpt-libopenmpt.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@
"../../src/openmpt/sounddevice/**.hpp",
"../../src/openmpt/soundfile_write/**.cpp",
"../../src/openmpt/soundfile_write/**.hpp",
"../../src/openmpt/streamencoder/**.cpp",
"../../src/openmpt/streamencoder/**.hpp",
}

defines { "LIBOPENMPT_BUILD" }
Expand Down
2 changes: 2 additions & 0 deletions build/premake/mpt-OpenMPT-NativeSupport.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
"../../src/openmpt/soundfile_data/**.hpp",
"../../src/openmpt/soundfile_write/**.cpp",
"../../src/openmpt/soundfile_write/**.hpp",
"../../src/openmpt/streamencoder/**.cpp",
"../../src/openmpt/streamencoder/**.hpp",
}
defines { "MODPLUG_TRACKER", "MPT_BUILD_WINESUPPORT" }
if _OPTIONS["charset"] ~= "Unicode" then
Expand Down
4 changes: 4 additions & 0 deletions build/premake/mpt-PluginBridge.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
"../../src/openmpt/soundfile_write/**.hpp",
"../../src/openmpt/sounddevice/**.cpp",
"../../src/openmpt/sounddevice/**.hpp",
"../../src/openmpt/streamencoder/**.cpp",
"../../src/openmpt/streamencoder/**.hpp",
}
files {
"../../pluginBridge/PluginBridge.rc",
Expand Down Expand Up @@ -91,6 +93,8 @@
"../../src/openmpt/soundfile_write/**.hpp",
"../../src/openmpt/sounddevice/**.cpp",
"../../src/openmpt/sounddevice/**.hpp",
"../../src/openmpt/streamencoder/**.cpp",
"../../src/openmpt/streamencoder/**.hpp",
}
files {
"../../pluginBridge/PluginBridge.rc",
Expand Down
2 changes: 2 additions & 0 deletions build/premake/mpt-libopenmpt-small.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@
"../../src/openmpt/sounddevice/**.hpp",
"../../src/openmpt/soundfile_write/**.cpp",
"../../src/openmpt/soundfile_write/**.hpp",
"../../src/openmpt/streamencoder/**.cpp",
"../../src/openmpt/streamencoder/**.hpp",
}
filter { "action:vs*" }
resdefines {
Expand Down
2 changes: 2 additions & 0 deletions build/premake/mpt-libopenmpt.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
"../../src/openmpt/sounddevice/**.hpp",
"../../src/openmpt/soundfile_write/**.cpp",
"../../src/openmpt/soundfile_write/**.hpp",
"../../src/openmpt/streamencoder/**.cpp",
"../../src/openmpt/streamencoder/**.hpp",
}
filter { "action:vs*", "kind:SharedLib or ConsoleApp or WindowedApp" }
resdefines {
Expand Down
2 changes: 2 additions & 0 deletions build/premake/mpt-libopenmpt_test.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@
"../../test/mpt_tests_uuid_namespace.cpp",
"../../src/openmpt/sounddevice/**.cpp",
"../../src/openmpt/sounddevice/**.hpp",
"../../src/openmpt/streamencoder/**.cpp",
"../../src/openmpt/streamencoder/**.hpp",
}

if _OPTIONS["charset"] ~= "Unicode" then
Expand Down
2 changes: 2 additions & 0 deletions build/premake/mpt-updatesigntool.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
"../../src/openmpt/soundfile_write/**.hpp",
"../../src/openmpt/sounddevice/**.cpp",
"../../src/openmpt/sounddevice/**.hpp",
"../../src/openmpt/streamencoder/**.cpp",
"../../src/openmpt/streamencoder/**.hpp",
}
defines { "MODPLUG_TRACKER", "MPT_BUILD_UPDATESIGNTOOL" }
if _OPTIONS["charset"] ~= "Unicode" then
Expand Down
32 changes: 16 additions & 16 deletions build/vs2017winxp/OpenMPT-ANSI.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -867,15 +867,7 @@
<ClInclude Include="..\..\mptrack\ScaleEnvPointsDlg.h" />
<ClInclude Include="..\..\mptrack\SelectPluginDialog.h" />
<ClInclude Include="..\..\mptrack\Settings.h" />
<ClInclude Include="..\..\mptrack\StreamEncoder.h" />
<ClInclude Include="..\..\mptrack\StreamEncoderAU.h" />
<ClInclude Include="..\..\mptrack\StreamEncoderFLAC.h" />
<ClInclude Include="..\..\mptrack\StreamEncoderMP3.h" />
<ClInclude Include="..\..\mptrack\StreamEncoderOpus.h" />
<ClInclude Include="..\..\mptrack\StreamEncoderRAW.h" />
<ClInclude Include="..\..\mptrack\StreamEncoderSettings.h" />
<ClInclude Include="..\..\mptrack\StreamEncoderVorbis.h" />
<ClInclude Include="..\..\mptrack\StreamEncoderWAV.h" />
<ClInclude Include="..\..\mptrack\TempoSwingDialog.h" />
<ClInclude Include="..\..\mptrack\TrackerSettings.h" />
<ClInclude Include="..\..\mptrack\TuningDialog.h" />
Expand Down Expand Up @@ -1199,6 +1191,14 @@
<ClInclude Include="..\..\src\openmpt\soundfile_data\tags.hpp" />
<ClInclude Include="..\..\src\openmpt\soundfile_data\wav.hpp" />
<ClInclude Include="..\..\src\openmpt\soundfile_write\wav_write.hpp" />
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoder.hpp" />
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.hpp" />
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.hpp" />
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.hpp" />
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.hpp" />
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.hpp" />
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.hpp" />
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp" />
<ClInclude Include="..\..\test\PlaybackTest.h" />
<ClInclude Include="..\..\test\TestTools.h" />
<ClInclude Include="..\..\test\TestToolsLib.h" />
Expand Down Expand Up @@ -1311,15 +1311,7 @@
<ClCompile Include="..\..\mptrack\ScaleEnvPointsDlg.cpp" />
<ClCompile Include="..\..\mptrack\SelectPluginDialog.cpp" />
<ClCompile Include="..\..\mptrack\Settings.cpp" />
<ClCompile Include="..\..\mptrack\StreamEncoder.cpp" />
<ClCompile Include="..\..\mptrack\StreamEncoderAU.cpp" />
<ClCompile Include="..\..\mptrack\StreamEncoderFLAC.cpp" />
<ClCompile Include="..\..\mptrack\StreamEncoderMP3.cpp" />
<ClCompile Include="..\..\mptrack\StreamEncoderOpus.cpp" />
<ClCompile Include="..\..\mptrack\StreamEncoderRAW.cpp" />
<ClCompile Include="..\..\mptrack\StreamEncoderSettings.cpp" />
<ClCompile Include="..\..\mptrack\StreamEncoderVorbis.cpp" />
<ClCompile Include="..\..\mptrack\StreamEncoderWAV.cpp" />
<ClCompile Include="..\..\mptrack\TempoSwingDialog.cpp" />
<ClCompile Include="..\..\mptrack\TrackerSettings.cpp" />
<ClCompile Include="..\..\mptrack\TuningDialog.cpp" />
Expand Down Expand Up @@ -1486,6 +1478,14 @@
<ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.cpp" />
<ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp" />
<ClCompile Include="..\..\src\openmpt\soundfile_write\wav_write.cpp" />
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoder.cpp" />
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.cpp" />
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.cpp" />
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.cpp" />
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.cpp" />
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.cpp" />
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.cpp" />
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp" />
<ClCompile Include="..\..\test\PlaybackTest.cpp" />
<ClCompile Include="..\..\test\TestToolsLib.cpp" />
<ClCompile Include="..\..\test\mpt_tests_base.cpp" />
Expand Down
99 changes: 51 additions & 48 deletions build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,9 @@
<Filter Include="src\openmpt\soundfile_write">
<UniqueIdentifier>{21750652-8D82-3438-1669-3023827500EF}</UniqueIdentifier>
</Filter>
<Filter Include="src\openmpt\streamencoder">
<UniqueIdentifier>{BA0C6BE9-26CF-9E73-6F7F-2D00DB807751}</UniqueIdentifier>
</Filter>
<Filter Include="test">
<UniqueIdentifier>{65689E7C-519F-9F0D-FA8B-8510E6A11B0F}</UniqueIdentifier>
</Filter>
Expand Down Expand Up @@ -561,33 +564,9 @@
<ClInclude Include="..\..\mptrack\Settings.h">
<Filter>mptrack</Filter>
</ClInclude>
<ClInclude Include="..\..\mptrack\StreamEncoder.h">
<Filter>mptrack</Filter>
</ClInclude>
<ClInclude Include="..\..\mptrack\StreamEncoderAU.h">
<Filter>mptrack</Filter>
</ClInclude>
<ClInclude Include="..\..\mptrack\StreamEncoderFLAC.h">
<Filter>mptrack</Filter>
</ClInclude>
<ClInclude Include="..\..\mptrack\StreamEncoderMP3.h">
<Filter>mptrack</Filter>
</ClInclude>
<ClInclude Include="..\..\mptrack\StreamEncoderOpus.h">
<Filter>mptrack</Filter>
</ClInclude>
<ClInclude Include="..\..\mptrack\StreamEncoderRAW.h">
<Filter>mptrack</Filter>
</ClInclude>
<ClInclude Include="..\..\mptrack\StreamEncoderSettings.h">
<Filter>mptrack</Filter>
</ClInclude>
<ClInclude Include="..\..\mptrack\StreamEncoderVorbis.h">
<Filter>mptrack</Filter>
</ClInclude>
<ClInclude Include="..\..\mptrack\StreamEncoderWAV.h">
<Filter>mptrack</Filter>
</ClInclude>
<ClInclude Include="..\..\mptrack\TempoSwingDialog.h">
<Filter>mptrack</Filter>
</ClInclude>
Expand Down Expand Up @@ -1557,6 +1536,30 @@
<ClInclude Include="..\..\src\openmpt\soundfile_write\wav_write.hpp">
<Filter>src\openmpt\soundfile_write</Filter>
</ClInclude>
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoder.hpp">
<Filter>src\openmpt\streamencoder</Filter>
</ClInclude>
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.hpp">
<Filter>src\openmpt\streamencoder</Filter>
</ClInclude>
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.hpp">
<Filter>src\openmpt\streamencoder</Filter>
</ClInclude>
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.hpp">
<Filter>src\openmpt\streamencoder</Filter>
</ClInclude>
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.hpp">
<Filter>src\openmpt\streamencoder</Filter>
</ClInclude>
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.hpp">
<Filter>src\openmpt\streamencoder</Filter>
</ClInclude>
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.hpp">
<Filter>src\openmpt\streamencoder</Filter>
</ClInclude>
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp">
<Filter>src\openmpt\streamencoder</Filter>
</ClInclude>
<ClInclude Include="..\..\test\PlaybackTest.h">
<Filter>test</Filter>
</ClInclude>
Expand Down Expand Up @@ -1889,33 +1892,9 @@
<ClCompile Include="..\..\mptrack\Settings.cpp">
<Filter>mptrack</Filter>
</ClCompile>
<ClCompile Include="..\..\mptrack\StreamEncoder.cpp">
<Filter>mptrack</Filter>
</ClCompile>
<ClCompile Include="..\..\mptrack\StreamEncoderAU.cpp">
<Filter>mptrack</Filter>
</ClCompile>
<ClCompile Include="..\..\mptrack\StreamEncoderFLAC.cpp">
<Filter>mptrack</Filter>
</ClCompile>
<ClCompile Include="..\..\mptrack\StreamEncoderMP3.cpp">
<Filter>mptrack</Filter>
</ClCompile>
<ClCompile Include="..\..\mptrack\StreamEncoderOpus.cpp">
<Filter>mptrack</Filter>
</ClCompile>
<ClCompile Include="..\..\mptrack\StreamEncoderRAW.cpp">
<Filter>mptrack</Filter>
</ClCompile>
<ClCompile Include="..\..\mptrack\StreamEncoderSettings.cpp">
<Filter>mptrack</Filter>
</ClCompile>
<ClCompile Include="..\..\mptrack\StreamEncoderVorbis.cpp">
<Filter>mptrack</Filter>
</ClCompile>
<ClCompile Include="..\..\mptrack\StreamEncoderWAV.cpp">
<Filter>mptrack</Filter>
</ClCompile>
<ClCompile Include="..\..\mptrack\TempoSwingDialog.cpp">
<Filter>mptrack</Filter>
</ClCompile>
Expand Down Expand Up @@ -2414,6 +2393,30 @@
<ClCompile Include="..\..\src\openmpt\soundfile_write\wav_write.cpp">
<Filter>src\openmpt\soundfile_write</Filter>
</ClCompile>
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoder.cpp">
<Filter>src\openmpt\streamencoder</Filter>
</ClCompile>
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.cpp">
<Filter>src\openmpt\streamencoder</Filter>
</ClCompile>
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.cpp">
<Filter>src\openmpt\streamencoder</Filter>
</ClCompile>
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.cpp">
<Filter>src\openmpt\streamencoder</Filter>
</ClCompile>
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.cpp">
<Filter>src\openmpt\streamencoder</Filter>
</ClCompile>
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.cpp">
<Filter>src\openmpt\streamencoder</Filter>
</ClCompile>
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.cpp">
<Filter>src\openmpt\streamencoder</Filter>
</ClCompile>
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp">
<Filter>src\openmpt\streamencoder</Filter>
</ClCompile>
<ClCompile Include="..\..\test\PlaybackTest.cpp">
<Filter>test</Filter>
</ClCompile>
Expand Down
32 changes: 16 additions & 16 deletions build/vs2017winxp/OpenMPT-UTF8.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -867,15 +867,7 @@
<ClInclude Include="..\..\mptrack\ScaleEnvPointsDlg.h" />
<ClInclude Include="..\..\mptrack\SelectPluginDialog.h" />
<ClInclude Include="..\..\mptrack\Settings.h" />
<ClInclude Include="..\..\mptrack\StreamEncoder.h" />
<ClInclude Include="..\..\mptrack\StreamEncoderAU.h" />
<ClInclude Include="..\..\mptrack\StreamEncoderFLAC.h" />
<ClInclude Include="..\..\mptrack\StreamEncoderMP3.h" />
<ClInclude Include="..\..\mptrack\StreamEncoderOpus.h" />
<ClInclude Include="..\..\mptrack\StreamEncoderRAW.h" />
<ClInclude Include="..\..\mptrack\StreamEncoderSettings.h" />
<ClInclude Include="..\..\mptrack\StreamEncoderVorbis.h" />
<ClInclude Include="..\..\mptrack\StreamEncoderWAV.h" />
<ClInclude Include="..\..\mptrack\TempoSwingDialog.h" />
<ClInclude Include="..\..\mptrack\TrackerSettings.h" />
<ClInclude Include="..\..\mptrack\TuningDialog.h" />
Expand Down Expand Up @@ -1199,6 +1191,14 @@
<ClInclude Include="..\..\src\openmpt\soundfile_data\tags.hpp" />
<ClInclude Include="..\..\src\openmpt\soundfile_data\wav.hpp" />
<ClInclude Include="..\..\src\openmpt\soundfile_write\wav_write.hpp" />
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoder.hpp" />
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.hpp" />
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.hpp" />
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.hpp" />
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.hpp" />
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.hpp" />
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.hpp" />
<ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp" />
<ClInclude Include="..\..\test\PlaybackTest.h" />
<ClInclude Include="..\..\test\TestTools.h" />
<ClInclude Include="..\..\test\TestToolsLib.h" />
Expand Down Expand Up @@ -1311,15 +1311,7 @@
<ClCompile Include="..\..\mptrack\ScaleEnvPointsDlg.cpp" />
<ClCompile Include="..\..\mptrack\SelectPluginDialog.cpp" />
<ClCompile Include="..\..\mptrack\Settings.cpp" />
<ClCompile Include="..\..\mptrack\StreamEncoder.cpp" />
<ClCompile Include="..\..\mptrack\StreamEncoderAU.cpp" />
<ClCompile Include="..\..\mptrack\StreamEncoderFLAC.cpp" />
<ClCompile Include="..\..\mptrack\StreamEncoderMP3.cpp" />
<ClCompile Include="..\..\mptrack\StreamEncoderOpus.cpp" />
<ClCompile Include="..\..\mptrack\StreamEncoderRAW.cpp" />
<ClCompile Include="..\..\mptrack\StreamEncoderSettings.cpp" />
<ClCompile Include="..\..\mptrack\StreamEncoderVorbis.cpp" />
<ClCompile Include="..\..\mptrack\StreamEncoderWAV.cpp" />
<ClCompile Include="..\..\mptrack\TempoSwingDialog.cpp" />
<ClCompile Include="..\..\mptrack\TrackerSettings.cpp" />
<ClCompile Include="..\..\mptrack\TuningDialog.cpp" />
Expand Down Expand Up @@ -1486,6 +1478,14 @@
<ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.cpp" />
<ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp" />
<ClCompile Include="..\..\src\openmpt\soundfile_write\wav_write.cpp" />
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoder.cpp" />
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.cpp" />
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.cpp" />
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.cpp" />
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.cpp" />
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.cpp" />
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.cpp" />
<ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp" />
<ClCompile Include="..\..\test\PlaybackTest.cpp" />
<ClCompile Include="..\..\test\TestToolsLib.cpp" />
<ClCompile Include="..\..\test\mpt_tests_base.cpp" />
Expand Down
Loading

0 comments on commit d8d517b

Please sign in to comment.