From b730d50b6d0aeaa50941f433c951e296592d34fa Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Tue, 10 Jan 2023 11:37:10 -0500 Subject: [PATCH 1/3] Introduce sub-folder organization of modules... ... Not only will the dependencies among individual modules be acyclic; those in the quotient graph of sub-folders will also be so. This is trivially true so long as there are no modules that depend on other modules, but might that change in future? --- .../cmake-modules/AudacityFunctions.cmake | 12 ++++ modules/CMakeLists.txt | 63 ++++--------------- modules/etc/CMakeLists.txt | 13 ++++ modules/{ => etc}/mod-null/CMakeLists.txt | 0 .../{ => etc}/mod-null/ModNullCallback.cpp | 0 modules/{ => etc}/mod-null/ModNullCallback.h | 0 modules/import-export/CMakeLists.txt | 41 ++++++++++++ modules/{ => import-export}/mod-aup/AUP.cpp | 0 .../mod-aup/CMakeLists.txt | 0 .../{ => import-export}/mod-aup/ImportAUP.cpp | 0 modules/{ => import-export}/mod-cl/CL.cpp | 0 .../{ => import-export}/mod-cl/CMakeLists.txt | 0 .../{ => import-export}/mod-cl/ExportCL.cpp | 0 .../mod-ffmpeg/CMakeLists.txt | 0 .../mod-ffmpeg/ExportFFmpeg.cpp | 0 .../mod-ffmpeg/ExportFFmpegOptions.cpp | 0 .../mod-ffmpeg/ExportFFmpegOptions.h | 0 .../{ => import-export}/mod-ffmpeg/FFmpeg.cpp | 0 .../{ => import-export}/mod-ffmpeg/FFmpeg.h | 0 .../mod-ffmpeg/FFmpegDefines.h | 0 .../mod-ffmpeg/FFmpegPrefs.cpp | 0 .../mod-ffmpeg/FFmpegPresets.cpp | 0 .../mod-ffmpeg/FFmpegPresets.h | 0 .../mod-ffmpeg/ImportFFmpeg.cpp | 0 .../lib-ffmpeg-support/AVCodecFunctions.h | 0 .../mod-ffmpeg/lib-ffmpeg-support/AVCodecID.h | 0 .../lib-ffmpeg-support/AVFormatFunctions.h | 0 .../lib-ffmpeg-support/AVUtilFunctions.h | 0 .../lib-ffmpeg-support/CMakeLists.txt | 0 .../lib-ffmpeg-support/FFmpegFunctions.cpp | 0 .../lib-ffmpeg-support/FFmpegFunctions.h | 0 .../lib-ffmpeg-support/FFmpegTypes.h | 0 .../generator/generate_headers.py | 0 .../generator/generate_headers.sh | 0 .../generator/generator.cpp | 0 .../impl/AVCodecIDLookup.inl | 0 .../impl/DynamicLibraryHelpers.cpp | 0 .../impl/DynamicLibraryHelpers.h | 0 .../impl/FFmpegAPIResolver.cpp | 0 .../impl/FFmpegAPIResolver.h | 0 .../lib-ffmpeg-support/impl/FFmpegLog.h | 0 .../impl/avcodec/55/AVCodecIDLookup.cpp | 0 .../impl/avcodec/55/AVCodecImpl.cpp | 0 .../impl/avcodec/57/AVCodecIDLookup.cpp | 0 .../impl/avcodec/57/AVCodecImpl.cpp | 0 .../impl/avcodec/58/AVCodecIDLookup.cpp | 0 .../impl/avcodec/58/AVCodecImpl.cpp | 0 .../impl/avcodec/59/AVCodecIDLookup.cpp | 0 .../impl/avcodec/59/AVCodecImpl.cpp | 0 .../impl/avcodec/60/AVCodecIDLookup.cpp | 0 .../impl/avcodec/60/AVCodecImpl.cpp | 0 .../avcodec/AVCodecContextWrapperImpl.inl | 0 .../impl/avcodec/AVCodecFunctionsLoader.cpp | 0 .../impl/avcodec/AVCodecFunctionsLoader.h | 0 .../impl/avcodec/AVCodecWrapperImpl.inl | 0 .../impl/avcodec/AVPacketWrapperImpl.inl | 0 .../impl/avformat/55/AVFormatImpl.cpp | 0 .../impl/avformat/57/AVFormatImpl.cpp | 0 .../impl/avformat/58/AVFormatImpl.cpp | 0 .../impl/avformat/59/AVFormatImpl.cpp | 0 .../impl/avformat/60/AVFormatImpl.cpp | 0 .../avformat/AVFormatContextWrapperImpl.inl | 0 .../impl/avformat/AVFormatFunctionsLoader.cpp | 0 .../impl/avformat/AVFormatFunctionsLoader.h | 0 .../impl/avformat/AVIOContextWrapperImpl.inl | 0 .../avformat/AVInputFormatWrapperImpl.inl | 0 .../avformat/AVOutputFormatWrapperImpl.inl | 0 .../impl/avformat/AVStreamWrapperImpl.inl | 0 .../impl/avutil/52/AVUtilImpl.cpp | 0 .../impl/avutil/52/avconfig.h | 0 .../impl/avutil/55/AVUtilImpl.cpp | 0 .../impl/avutil/55/avconfig.h | 0 .../impl/avutil/56/AVUtilImpl.cpp | 0 .../impl/avutil/56/avconfig.h | 0 .../impl/avutil/57/AVUtilImpl.cpp | 0 .../impl/avutil/57/avconfig.h | 0 .../impl/avutil/58/AVUtilImpl.cpp | 0 .../impl/avutil/58/avconfig.h | 0 .../impl/avutil/AVFrameWrapperImpl.inl | 0 .../impl/avutil/AVUtilFunctionsLoader.cpp | 0 .../impl/avutil/AVUtilFunctionsLoader.h | 0 .../impl/avutil/FFmpegLogImpl.inl | 0 .../impl/ffmpeg-2.3.6-single-header.h | 0 .../impl/ffmpeg-3.4.8-single-header.h | 0 .../impl/ffmpeg-4.2.4-single-header.h | 0 .../impl/ffmpeg-5.0.1-single-header.h | 0 .../impl/ffmpeg-6.0.0-single-header.h | 0 .../wrappers/AVCodecContextWrapper.cpp | 0 .../wrappers/AVCodecContextWrapper.h | 0 .../wrappers/AVCodecWrapper.cpp | 0 .../wrappers/AVCodecWrapper.h | 0 .../wrappers/AVDictionaryWrapper.cpp | 0 .../wrappers/AVDictionaryWrapper.h | 0 .../wrappers/AVFifoBufferWrapper.cpp | 0 .../wrappers/AVFifoBufferWrapper.h | 0 .../wrappers/AVFormatContextWrapper.cpp | 0 .../wrappers/AVFormatContextWrapper.h | 0 .../wrappers/AVFrameWrapper.cpp | 0 .../wrappers/AVFrameWrapper.h | 0 .../wrappers/AVIOContextWrapper.cpp | 0 .../wrappers/AVIOContextWrapper.h | 0 .../wrappers/AVInputFormatWrapper.cpp | 0 .../wrappers/AVInputFormatWrapper.h | 0 .../wrappers/AVOutputFormatWrapper.cpp | 0 .../wrappers/AVOutputFormatWrapper.h | 0 .../wrappers/AVPacketWrapper.cpp | 0 .../wrappers/AVPacketWrapper.h | 0 .../wrappers/AVStreamWrapper.cpp | 0 .../wrappers/AVStreamWrapper.h | 0 .../mod-flac/CMakeLists.txt | 0 .../mod-flac/ExportFLAC.cpp | 0 modules/{ => import-export}/mod-flac/FLAC.cpp | 0 .../mod-flac/ImportFLAC.cpp | 0 .../mod-lof/CMakeLists.txt | 0 .../{ => import-export}/mod-lof/ImportLOF.cpp | 0 modules/{ => import-export}/mod-lof/LOF.cpp | 0 .../mod-mp2/CMakeLists.txt | 0 .../{ => import-export}/mod-mp2/ExportMP2.cpp | 0 modules/{ => import-export}/mod-mp2/MP2.cpp | 0 .../mod-mp3/CMakeLists.txt | 0 .../{ => import-export}/mod-mp3/ExportMP3.cpp | 0 .../{ => import-export}/mod-mp3/ExportMP3.h | 0 modules/{ => import-export}/mod-mp3/MP3.cpp | 0 .../{ => import-export}/mod-mp3/MP3Prefs.cpp | 0 .../mod-mpg123/CMakeLists.txt | 0 .../mod-mpg123/ImportMP3_MPG123.cpp | 0 .../{ => import-export}/mod-mpg123/MPG123.cpp | 0 .../mod-ogg/CMakeLists.txt | 0 .../{ => import-export}/mod-ogg/ExportOGG.cpp | 0 .../{ => import-export}/mod-ogg/ImportOGG.cpp | 0 modules/{ => import-export}/mod-ogg/OGG.cpp | 0 .../mod-opus/CMakeLists.txt | 0 .../mod-opus/ExportOpus.cpp | 0 .../mod-opus/ImportOpus.cpp | 0 modules/{ => import-export}/mod-opus/Opus.cpp | 0 .../mod-pcm/CMakeLists.txt | 0 .../{ => import-export}/mod-pcm/ExportPCM.cpp | 0 .../{ => import-export}/mod-pcm/ImportPCM.cpp | 0 modules/{ => import-export}/mod-pcm/PCM.cpp | 0 .../mod-wavpack/CMakeLists.txt | 0 .../mod-wavpack/ExportWavPack.cpp | 0 .../mod-wavpack/ImportWavPack.cpp | 0 .../mod-wavpack/WavPack.cpp | 0 modules/nyquist/CMakeLists.txt | 14 +++++ .../mod-nyq-bench/CMakeLists.txt | 0 .../{ => nyquist}/mod-nyq-bench/NyqBench.cpp | 0 .../{ => nyquist}/mod-nyq-bench/NyqBench.h | 0 .../{ => nyquist}/mod-nyq-bench/Readme.txt | 0 .../images/document-new-large.xpm | 0 .../images/document-new-small.xpm | 0 .../images/document-open-large.xpm | 0 .../images/document-open-small.xpm | 0 .../images/document-save-as-large.xpm | 0 .../images/document-save-as-small.xpm | 0 .../images/document-save-large.xpm | 0 .../images/document-save-small.xpm | 0 .../mod-nyq-bench/images/edit-clear-large.xpm | 0 .../mod-nyq-bench/images/edit-clear-small.xpm | 0 .../mod-nyq-bench/images/edit-copy-large.xpm | 0 .../mod-nyq-bench/images/edit-copy-small.xpm | 0 .../mod-nyq-bench/images/edit-cut-large.xpm | 0 .../mod-nyq-bench/images/edit-cut-small.xpm | 0 .../images/edit-delete-large.xpm | 0 .../images/edit-delete-small.xpm | 0 .../mod-nyq-bench/images/edit-find-large.xpm | 0 .../mod-nyq-bench/images/edit-find-small.xpm | 0 .../mod-nyq-bench/images/edit-paste-large.xpm | 0 .../mod-nyq-bench/images/edit-paste-small.xpm | 0 .../mod-nyq-bench/images/edit-redo-large.xpm | 0 .../mod-nyq-bench/images/edit-redo-small.xpm | 0 .../images/edit-select-all-large.xpm | 0 .../images/edit-select-all-small.xpm | 0 .../mod-nyq-bench/images/edit-undo-large.xpm | 0 .../mod-nyq-bench/images/edit-undo-small.xpm | 0 .../mod-nyq-bench/images/go-next-large.xpm | 0 .../mod-nyq-bench/images/go-next-small.xpm | 0 .../images/go-previous-large.xpm | 0 .../images/go-previous-small.xpm | 0 .../mod-nyq-bench/images/go-top-large.xpm | 0 .../mod-nyq-bench/images/go-top-small.xpm | 0 .../mod-nyq-bench/images/go-up-large.xpm | 0 .../mod-nyq-bench/images/go-up-small.xpm | 0 .../images/media-playback-pause-large.xpm | 0 .../images/media-playback-pause-small.xpm | 0 .../images/media-playback-start-large.xpm | 0 .../images/media-playback-start-small.xpm | 0 .../images/media-playback-stop-large.xpm | 0 .../images/media-playback-stop-small.xpm | 0 .../images/system-search-large.xpm | 0 .../images/system-search-small.xpm | 0 modules/scripting/CMakeLists.txt | 9 +++ .../mod-script-pipe/CMakeLists.txt | 0 .../mod-script-pipe/PipeServer.cpp | 0 .../mod-script-pipe/ScripterCallback.cpp | 0 .../mod-script-pipe/ScripterCallback.h | 0 modules/sharing/CMakeLists.txt | 9 +++ .../mod-cloud-audiocom/AudioComModule.cpp | 0 .../AuthorizationHandler.cpp | 0 .../mod-cloud-audiocom/AuthorizationHandler.h | 0 .../mod-cloud-audiocom/CMakeLists.txt | 0 .../CloudModuleSettings.cpp | 0 .../mod-cloud-audiocom/CloudModuleSettings.h | 0 .../CloudProjectFileIOExtensions.cpp | 0 .../CloudProjectFileIOExtensions.h | 0 .../CloudProjectMixdownUtils.cpp | 0 .../CloudProjectMixdownUtils.h | 0 .../CloudProjectOpenUtils.cpp | 0 .../CloudProjectOpenUtils.h | 0 .../mod-cloud-audiocom/LinkUrlHandler.cpp | 0 .../menus/AudioComMenus.cpp | 0 .../ui/AudioComPrefsPanel.cpp | 0 .../ui/CloudSyncStatusField.cpp | 0 .../ui/CloudSyncStatusField.h | 0 .../ui/ProjectCloudUIExtension.cpp | 0 .../ui/ProjectCloudUIExtension.h | 0 .../ui/ShareAudioToolbar.cpp | 0 .../mod-cloud-audiocom/ui/ShareAudioToolbar.h | 0 .../mod-cloud-audiocom/ui/UserImage.cpp | 0 .../mod-cloud-audiocom/ui/UserImage.h | 0 .../mod-cloud-audiocom/ui/UserPanel.cpp | 0 .../mod-cloud-audiocom/ui/UserPanel.h | 0 .../ui/dialogs/AudioComDialogBase.cpp | 0 .../ui/dialogs/AudioComDialogBase.h | 0 .../ui/dialogs/CloudLocationDialog.cpp | 0 .../ui/dialogs/CloudLocationDialog.h | 0 .../dialogs/CloudProjectPropertiesDialog.cpp | 0 .../ui/dialogs/CloudProjectPropertiesDialog.h | 0 .../ui/dialogs/ConnectionIssuesDialog.cpp | 0 .../ui/dialogs/ConnectionIssuesDialog.h | 0 .../ui/dialogs/LinkAccountDialog.cpp | 0 .../ui/dialogs/LinkAccountDialog.h | 0 .../ui/dialogs/LinkFailedDialog.cpp | 0 .../ui/dialogs/LinkFailedDialog.h | 0 .../ui/dialogs/LinkSucceededDialog.cpp | 0 .../ui/dialogs/LinkSucceededDialog.h | 0 .../ui/dialogs/LinkWithTokenDialog.cpp | 0 .../ui/dialogs/LinkWithTokenDialog.h | 0 .../ui/dialogs/NotCloudProjectDialog.cpp | 0 .../ui/dialogs/NotCloudProjectDialog.h | 0 .../ui/dialogs/ProjectLimitDialog.cpp | 0 .../ui/dialogs/ProjectLimitDialog.h | 0 .../dialogs/ProjectVersionConflictDialog.cpp | 0 .../ui/dialogs/ProjectVersionConflictDialog.h | 0 .../ui/dialogs/ProjectsListDialog.cpp | 0 .../ui/dialogs/ProjectsListDialog.h | 0 .../ui/dialogs/ShareAudioDialog.cpp | 0 .../ui/dialogs/ShareAudioDialog.h | 0 .../ui/dialogs/SyncFailedDialog.cpp | 0 .../ui/dialogs/SyncFailedDialog.h | 0 .../ui/dialogs/SyncInBackroundDialog.cpp | 0 .../ui/dialogs/SyncInBackroundDialog.h | 0 .../ui/dialogs/SyncSucceededDialog.cpp | 0 .../ui/dialogs/SyncSucceededDialog.h | 0 .../ui/dialogs/UnsyncedProjectDialog.cpp | 0 .../ui/dialogs/UnsyncedProjectDialog.h | 0 .../ui/dialogs/UploadCanceledDialog.cpp | 0 .../ui/dialogs/UploadCanceledDialog.h | 0 .../ui/dialogs/WaitForActionDialog.cpp | 0 .../ui/dialogs/WaitForActionDialog.h | 0 .../ui/images/CloudImages.cpp | 0 .../ui/images/CloudImages.hpp | 0 modules/track-ui/CMakeLists.txt | 9 +++ .../mod-midi-import-export/CMakeLists.txt | 0 .../mod-midi-import-export/ExportMIDI.cpp | 0 .../mod-midi-import-export/ImportMIDI.cpp | 0 265 files changed, 118 insertions(+), 52 deletions(-) create mode 100644 modules/etc/CMakeLists.txt rename modules/{ => etc}/mod-null/CMakeLists.txt (100%) rename modules/{ => etc}/mod-null/ModNullCallback.cpp (100%) rename modules/{ => etc}/mod-null/ModNullCallback.h (100%) create mode 100644 modules/import-export/CMakeLists.txt rename modules/{ => import-export}/mod-aup/AUP.cpp (100%) rename modules/{ => import-export}/mod-aup/CMakeLists.txt (100%) rename modules/{ => import-export}/mod-aup/ImportAUP.cpp (100%) rename modules/{ => import-export}/mod-cl/CL.cpp (100%) rename modules/{ => import-export}/mod-cl/CMakeLists.txt (100%) rename modules/{ => import-export}/mod-cl/ExportCL.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/CMakeLists.txt (100%) rename modules/{ => import-export}/mod-ffmpeg/ExportFFmpeg.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/ExportFFmpegOptions.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/ExportFFmpegOptions.h (100%) rename modules/{ => import-export}/mod-ffmpeg/FFmpeg.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/FFmpeg.h (100%) rename modules/{ => import-export}/mod-ffmpeg/FFmpegDefines.h (100%) rename modules/{ => import-export}/mod-ffmpeg/FFmpegPrefs.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/FFmpegPresets.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/FFmpegPresets.h (100%) rename modules/{ => import-export}/mod-ffmpeg/ImportFFmpeg.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/AVCodecFunctions.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/AVCodecID.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/AVFormatFunctions.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/AVUtilFunctions.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/CMakeLists.txt (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/FFmpegFunctions.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/FFmpegFunctions.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/FFmpegTypes.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/generator/generate_headers.py (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/generator/generate_headers.sh (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/generator/generator.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/AVCodecIDLookup.inl (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/DynamicLibraryHelpers.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/DynamicLibraryHelpers.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/FFmpegAPIResolver.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/FFmpegAPIResolver.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/FFmpegLog.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/55/AVCodecIDLookup.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/55/AVCodecImpl.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/57/AVCodecIDLookup.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/57/AVCodecImpl.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/58/AVCodecIDLookup.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/58/AVCodecImpl.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/59/AVCodecIDLookup.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/59/AVCodecImpl.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/60/AVCodecIDLookup.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/60/AVCodecImpl.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVCodecContextWrapperImpl.inl (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVCodecFunctionsLoader.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVCodecFunctionsLoader.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVCodecWrapperImpl.inl (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVPacketWrapperImpl.inl (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/55/AVFormatImpl.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/57/AVFormatImpl.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/58/AVFormatImpl.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/59/AVFormatImpl.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/60/AVFormatImpl.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVFormatContextWrapperImpl.inl (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVFormatFunctionsLoader.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVFormatFunctionsLoader.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVIOContextWrapperImpl.inl (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVInputFormatWrapperImpl.inl (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVOutputFormatWrapperImpl.inl (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVStreamWrapperImpl.inl (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/52/AVUtilImpl.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/52/avconfig.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/55/AVUtilImpl.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/55/avconfig.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/56/AVUtilImpl.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/56/avconfig.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/57/AVUtilImpl.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/57/avconfig.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/58/AVUtilImpl.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/58/avconfig.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/AVFrameWrapperImpl.inl (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/AVUtilFunctionsLoader.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/AVUtilFunctionsLoader.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/FFmpegLogImpl.inl (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-2.3.6-single-header.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-3.4.8-single-header.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-4.2.4-single-header.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-5.0.1-single-header.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-6.0.0-single-header.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVCodecContextWrapper.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVCodecContextWrapper.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVCodecWrapper.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVCodecWrapper.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVDictionaryWrapper.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVDictionaryWrapper.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFifoBufferWrapper.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFifoBufferWrapper.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFormatContextWrapper.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFormatContextWrapper.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFrameWrapper.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFrameWrapper.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVIOContextWrapper.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVIOContextWrapper.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVInputFormatWrapper.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVInputFormatWrapper.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVOutputFormatWrapper.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVOutputFormatWrapper.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVPacketWrapper.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVPacketWrapper.h (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVStreamWrapper.cpp (100%) rename modules/{ => import-export}/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVStreamWrapper.h (100%) rename modules/{ => import-export}/mod-flac/CMakeLists.txt (100%) rename modules/{ => import-export}/mod-flac/ExportFLAC.cpp (100%) rename modules/{ => import-export}/mod-flac/FLAC.cpp (100%) rename modules/{ => import-export}/mod-flac/ImportFLAC.cpp (100%) rename modules/{ => import-export}/mod-lof/CMakeLists.txt (100%) rename modules/{ => import-export}/mod-lof/ImportLOF.cpp (100%) rename modules/{ => import-export}/mod-lof/LOF.cpp (100%) rename modules/{ => import-export}/mod-mp2/CMakeLists.txt (100%) rename modules/{ => import-export}/mod-mp2/ExportMP2.cpp (100%) rename modules/{ => import-export}/mod-mp2/MP2.cpp (100%) rename modules/{ => import-export}/mod-mp3/CMakeLists.txt (100%) rename modules/{ => import-export}/mod-mp3/ExportMP3.cpp (100%) rename modules/{ => import-export}/mod-mp3/ExportMP3.h (100%) rename modules/{ => import-export}/mod-mp3/MP3.cpp (100%) rename modules/{ => import-export}/mod-mp3/MP3Prefs.cpp (100%) rename modules/{ => import-export}/mod-mpg123/CMakeLists.txt (100%) rename modules/{ => import-export}/mod-mpg123/ImportMP3_MPG123.cpp (100%) rename modules/{ => import-export}/mod-mpg123/MPG123.cpp (100%) rename modules/{ => import-export}/mod-ogg/CMakeLists.txt (100%) rename modules/{ => import-export}/mod-ogg/ExportOGG.cpp (100%) rename modules/{ => import-export}/mod-ogg/ImportOGG.cpp (100%) rename modules/{ => import-export}/mod-ogg/OGG.cpp (100%) rename modules/{ => import-export}/mod-opus/CMakeLists.txt (100%) rename modules/{ => import-export}/mod-opus/ExportOpus.cpp (100%) rename modules/{ => import-export}/mod-opus/ImportOpus.cpp (100%) rename modules/{ => import-export}/mod-opus/Opus.cpp (100%) rename modules/{ => import-export}/mod-pcm/CMakeLists.txt (100%) rename modules/{ => import-export}/mod-pcm/ExportPCM.cpp (100%) rename modules/{ => import-export}/mod-pcm/ImportPCM.cpp (100%) rename modules/{ => import-export}/mod-pcm/PCM.cpp (100%) rename modules/{ => import-export}/mod-wavpack/CMakeLists.txt (100%) rename modules/{ => import-export}/mod-wavpack/ExportWavPack.cpp (100%) rename modules/{ => import-export}/mod-wavpack/ImportWavPack.cpp (100%) rename modules/{ => import-export}/mod-wavpack/WavPack.cpp (100%) create mode 100644 modules/nyquist/CMakeLists.txt rename modules/{ => nyquist}/mod-nyq-bench/CMakeLists.txt (100%) rename modules/{ => nyquist}/mod-nyq-bench/NyqBench.cpp (100%) rename modules/{ => nyquist}/mod-nyq-bench/NyqBench.h (100%) rename modules/{ => nyquist}/mod-nyq-bench/Readme.txt (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/document-new-large.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/document-new-small.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/document-open-large.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/document-open-small.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/document-save-as-large.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/document-save-as-small.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/document-save-large.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/document-save-small.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/edit-clear-large.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/edit-clear-small.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/edit-copy-large.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/edit-copy-small.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/edit-cut-large.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/edit-cut-small.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/edit-delete-large.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/edit-delete-small.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/edit-find-large.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/edit-find-small.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/edit-paste-large.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/edit-paste-small.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/edit-redo-large.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/edit-redo-small.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/edit-select-all-large.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/edit-select-all-small.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/edit-undo-large.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/edit-undo-small.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/go-next-large.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/go-next-small.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/go-previous-large.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/go-previous-small.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/go-top-large.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/go-top-small.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/go-up-large.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/go-up-small.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/media-playback-pause-large.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/media-playback-pause-small.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/media-playback-start-large.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/media-playback-start-small.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/media-playback-stop-large.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/media-playback-stop-small.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/system-search-large.xpm (100%) rename modules/{ => nyquist}/mod-nyq-bench/images/system-search-small.xpm (100%) create mode 100644 modules/scripting/CMakeLists.txt rename modules/{ => scripting}/mod-script-pipe/CMakeLists.txt (100%) rename modules/{ => scripting}/mod-script-pipe/PipeServer.cpp (100%) rename modules/{ => scripting}/mod-script-pipe/ScripterCallback.cpp (100%) rename modules/{ => scripting}/mod-script-pipe/ScripterCallback.h (100%) create mode 100644 modules/sharing/CMakeLists.txt rename modules/{ => sharing}/mod-cloud-audiocom/AudioComModule.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/AuthorizationHandler.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/AuthorizationHandler.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/CMakeLists.txt (100%) rename modules/{ => sharing}/mod-cloud-audiocom/CloudModuleSettings.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/CloudModuleSettings.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/CloudProjectFileIOExtensions.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/CloudProjectFileIOExtensions.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/CloudProjectMixdownUtils.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/CloudProjectMixdownUtils.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/CloudProjectOpenUtils.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/CloudProjectOpenUtils.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/LinkUrlHandler.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/menus/AudioComMenus.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/AudioComPrefsPanel.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/CloudSyncStatusField.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/CloudSyncStatusField.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/ProjectCloudUIExtension.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/ProjectCloudUIExtension.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/ShareAudioToolbar.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/ShareAudioToolbar.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/UserImage.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/UserImage.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/UserPanel.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/UserPanel.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/AudioComDialogBase.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/AudioComDialogBase.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/CloudLocationDialog.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/CloudLocationDialog.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/CloudProjectPropertiesDialog.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/CloudProjectPropertiesDialog.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/ConnectionIssuesDialog.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/ConnectionIssuesDialog.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/LinkAccountDialog.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/LinkAccountDialog.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/LinkFailedDialog.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/LinkFailedDialog.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/LinkSucceededDialog.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/LinkSucceededDialog.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/LinkWithTokenDialog.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/LinkWithTokenDialog.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/NotCloudProjectDialog.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/NotCloudProjectDialog.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/ProjectLimitDialog.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/ProjectLimitDialog.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/ProjectVersionConflictDialog.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/ProjectVersionConflictDialog.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/ProjectsListDialog.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/ProjectsListDialog.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/ShareAudioDialog.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/ShareAudioDialog.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/SyncFailedDialog.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/SyncFailedDialog.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/SyncInBackroundDialog.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/SyncInBackroundDialog.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/SyncSucceededDialog.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/SyncSucceededDialog.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/UnsyncedProjectDialog.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/UnsyncedProjectDialog.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/UploadCanceledDialog.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/UploadCanceledDialog.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/WaitForActionDialog.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/dialogs/WaitForActionDialog.h (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/images/CloudImages.cpp (100%) rename modules/{ => sharing}/mod-cloud-audiocom/ui/images/CloudImages.hpp (100%) create mode 100644 modules/track-ui/CMakeLists.txt rename modules/{ => track-ui}/mod-midi-import-export/CMakeLists.txt (100%) rename modules/{ => track-ui}/mod-midi-import-export/ExportMIDI.cpp (100%) rename modules/{ => track-ui}/mod-midi-import-export/ImportMIDI.cpp (100%) diff --git a/cmake-proxies/cmake-modules/AudacityFunctions.cmake b/cmake-proxies/cmake-modules/AudacityFunctions.cmake index b51c6041459c..2b9ecacafe6a 100644 --- a/cmake-proxies/cmake-modules/AudacityFunctions.cmake +++ b/cmake-proxies/cmake-modules/AudacityFunctions.cmake @@ -848,3 +848,15 @@ function(fix_bundle target_name) -config=$ ) endfunction() + + +# The list of modules is ordered so that each module occurs after any others +# that it depends on +macro( audacity_module_subdirectory modules ) + foreach( MODULE ${MODULES} ) + add_subdirectory("${MODULE}") + endforeach() + + #propagate collected edges up to root CMakeLists.txt + set( GRAPH_EDGES "${GRAPH_EDGES}" PARENT_SCOPE ) +endmacro() diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 6fb4f3ecd230..fd7b0c5285c1 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -1,59 +1,18 @@ # Include the modules that we'll build -# The list of modules is ordered so that each module occurs after any others -# that it depends on -set( MODULES - mod-midi-import-export - mod-script-pipe - mod-mp3 - mod-pcm - mod-cl - mod-lof - mod-aup +# The list of module sub-folders is ordered so that each folder occurs after any +# others that it depends on +set( FOLDERS + etc + import-export + track-ui + scripting + nyquist + sharing ) -if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows" ) - list( APPEND MODULES - mod-null - mod-nyq-bench - ) -endif() -if ( USE_LIBOGG AND USE_LIBVORBIS ) - list( APPEND MODULES mod-ogg ) -endif() - -if ( USE_LIBFLAC ) - list( APPEND MODULES mod-flac ) -endif() - -if ( USE_LIBTWOLAME ) - list ( APPEND MODULES mod-mp2) -endif() - -if ( USE_WAVPACK ) - list ( APPEND MODULES mod-wavpack ) -endif() - -if ( USE_LIBMPG123 ) - list ( APPEND MODULES mod-mpg123 ) -endif() - -if ( USE_FFMPEG ) - list ( APPEND MODULES mod-ffmpeg ) -endif() - -if ( USE_LIBOPUS AND USE_OPUSFILE AND USE_LIBOGG ) - list ( APPEND MODULES mod-opus ) -endif() - -if ( ${_OPT}has_audiocom_upload) - list( APPEND MODULES - mod-cloud-audiocom - ) -endif() - -foreach( MODULE ${MODULES} ) - add_subdirectory("${MODULE}") +foreach( FOLDER ${FOLDERS} ) + add_subdirectory("${FOLDER}") endforeach() #propagate collected edges up to root CMakeLists.txt diff --git a/modules/etc/CMakeLists.txt b/modules/etc/CMakeLists.txt new file mode 100644 index 000000000000..89cfda5d54bc --- /dev/null +++ b/modules/etc/CMakeLists.txt @@ -0,0 +1,13 @@ +# Include the modules that we'll build + +# The list of modules is ordered so that each module occurs after any others +# that it depends on +set( MODULES +) +if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows" ) + list( APPEND MODULES + mod-null + ) +endif() + +audacity_module_subdirectory("${MODULES}") diff --git a/modules/mod-null/CMakeLists.txt b/modules/etc/mod-null/CMakeLists.txt similarity index 100% rename from modules/mod-null/CMakeLists.txt rename to modules/etc/mod-null/CMakeLists.txt diff --git a/modules/mod-null/ModNullCallback.cpp b/modules/etc/mod-null/ModNullCallback.cpp similarity index 100% rename from modules/mod-null/ModNullCallback.cpp rename to modules/etc/mod-null/ModNullCallback.cpp diff --git a/modules/mod-null/ModNullCallback.h b/modules/etc/mod-null/ModNullCallback.h similarity index 100% rename from modules/mod-null/ModNullCallback.h rename to modules/etc/mod-null/ModNullCallback.h diff --git a/modules/import-export/CMakeLists.txt b/modules/import-export/CMakeLists.txt new file mode 100644 index 000000000000..eae7ef4a7d31 --- /dev/null +++ b/modules/import-export/CMakeLists.txt @@ -0,0 +1,41 @@ +# Include the modules that we'll build + +# The list of modules is ordered so that each module occurs after any others +# that it depends on +set( MODULES + mod-mp3 + mod-pcm + mod-cl + mod-lof + mod-aup +) + +if ( USE_LIBOGG AND USE_LIBVORBIS ) + list( APPEND MODULES mod-ogg ) +endif() + +if ( USE_LIBFLAC ) + list( APPEND MODULES mod-flac ) +endif() + +if ( USE_LIBTWOLAME ) + list ( APPEND MODULES mod-mp2 ) +endif() + +if ( USE_WAVPACK ) + list ( APPEND MODULES mod-wavpack ) +endif() + +if ( USE_LIBMPG123 ) + list ( APPEND MODULES mod-mpg123 ) +endif() + +if ( USE_FFMPEG ) + list ( APPEND MODULES mod-ffmpeg ) +endif() + +if ( USE_LIBOPUS AND USE_OPUSFILE AND USE_LIBOGG ) + list ( APPEND MODULES mod-opus ) +endif() + +audacity_module_subdirectory("${MODULES}") diff --git a/modules/mod-aup/AUP.cpp b/modules/import-export/mod-aup/AUP.cpp similarity index 100% rename from modules/mod-aup/AUP.cpp rename to modules/import-export/mod-aup/AUP.cpp diff --git a/modules/mod-aup/CMakeLists.txt b/modules/import-export/mod-aup/CMakeLists.txt similarity index 100% rename from modules/mod-aup/CMakeLists.txt rename to modules/import-export/mod-aup/CMakeLists.txt diff --git a/modules/mod-aup/ImportAUP.cpp b/modules/import-export/mod-aup/ImportAUP.cpp similarity index 100% rename from modules/mod-aup/ImportAUP.cpp rename to modules/import-export/mod-aup/ImportAUP.cpp diff --git a/modules/mod-cl/CL.cpp b/modules/import-export/mod-cl/CL.cpp similarity index 100% rename from modules/mod-cl/CL.cpp rename to modules/import-export/mod-cl/CL.cpp diff --git a/modules/mod-cl/CMakeLists.txt b/modules/import-export/mod-cl/CMakeLists.txt similarity index 100% rename from modules/mod-cl/CMakeLists.txt rename to modules/import-export/mod-cl/CMakeLists.txt diff --git a/modules/mod-cl/ExportCL.cpp b/modules/import-export/mod-cl/ExportCL.cpp similarity index 100% rename from modules/mod-cl/ExportCL.cpp rename to modules/import-export/mod-cl/ExportCL.cpp diff --git a/modules/mod-ffmpeg/CMakeLists.txt b/modules/import-export/mod-ffmpeg/CMakeLists.txt similarity index 100% rename from modules/mod-ffmpeg/CMakeLists.txt rename to modules/import-export/mod-ffmpeg/CMakeLists.txt diff --git a/modules/mod-ffmpeg/ExportFFmpeg.cpp b/modules/import-export/mod-ffmpeg/ExportFFmpeg.cpp similarity index 100% rename from modules/mod-ffmpeg/ExportFFmpeg.cpp rename to modules/import-export/mod-ffmpeg/ExportFFmpeg.cpp diff --git a/modules/mod-ffmpeg/ExportFFmpegOptions.cpp b/modules/import-export/mod-ffmpeg/ExportFFmpegOptions.cpp similarity index 100% rename from modules/mod-ffmpeg/ExportFFmpegOptions.cpp rename to modules/import-export/mod-ffmpeg/ExportFFmpegOptions.cpp diff --git a/modules/mod-ffmpeg/ExportFFmpegOptions.h b/modules/import-export/mod-ffmpeg/ExportFFmpegOptions.h similarity index 100% rename from modules/mod-ffmpeg/ExportFFmpegOptions.h rename to modules/import-export/mod-ffmpeg/ExportFFmpegOptions.h diff --git a/modules/mod-ffmpeg/FFmpeg.cpp b/modules/import-export/mod-ffmpeg/FFmpeg.cpp similarity index 100% rename from modules/mod-ffmpeg/FFmpeg.cpp rename to modules/import-export/mod-ffmpeg/FFmpeg.cpp diff --git a/modules/mod-ffmpeg/FFmpeg.h b/modules/import-export/mod-ffmpeg/FFmpeg.h similarity index 100% rename from modules/mod-ffmpeg/FFmpeg.h rename to modules/import-export/mod-ffmpeg/FFmpeg.h diff --git a/modules/mod-ffmpeg/FFmpegDefines.h b/modules/import-export/mod-ffmpeg/FFmpegDefines.h similarity index 100% rename from modules/mod-ffmpeg/FFmpegDefines.h rename to modules/import-export/mod-ffmpeg/FFmpegDefines.h diff --git a/modules/mod-ffmpeg/FFmpegPrefs.cpp b/modules/import-export/mod-ffmpeg/FFmpegPrefs.cpp similarity index 100% rename from modules/mod-ffmpeg/FFmpegPrefs.cpp rename to modules/import-export/mod-ffmpeg/FFmpegPrefs.cpp diff --git a/modules/mod-ffmpeg/FFmpegPresets.cpp b/modules/import-export/mod-ffmpeg/FFmpegPresets.cpp similarity index 100% rename from modules/mod-ffmpeg/FFmpegPresets.cpp rename to modules/import-export/mod-ffmpeg/FFmpegPresets.cpp diff --git a/modules/mod-ffmpeg/FFmpegPresets.h b/modules/import-export/mod-ffmpeg/FFmpegPresets.h similarity index 100% rename from modules/mod-ffmpeg/FFmpegPresets.h rename to modules/import-export/mod-ffmpeg/FFmpegPresets.h diff --git a/modules/mod-ffmpeg/ImportFFmpeg.cpp b/modules/import-export/mod-ffmpeg/ImportFFmpeg.cpp similarity index 100% rename from modules/mod-ffmpeg/ImportFFmpeg.cpp rename to modules/import-export/mod-ffmpeg/ImportFFmpeg.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/AVCodecFunctions.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/AVCodecFunctions.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/AVCodecFunctions.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/AVCodecFunctions.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/AVCodecID.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/AVCodecID.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/AVCodecID.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/AVCodecID.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/AVFormatFunctions.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/AVFormatFunctions.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/AVFormatFunctions.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/AVFormatFunctions.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/AVUtilFunctions.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/AVUtilFunctions.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/AVUtilFunctions.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/AVUtilFunctions.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/CMakeLists.txt b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/CMakeLists.txt similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/CMakeLists.txt rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/CMakeLists.txt diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/FFmpegFunctions.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/FFmpegFunctions.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/FFmpegFunctions.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/FFmpegFunctions.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/FFmpegFunctions.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/FFmpegFunctions.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/FFmpegFunctions.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/FFmpegFunctions.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/FFmpegTypes.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/FFmpegTypes.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/FFmpegTypes.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/FFmpegTypes.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/generator/generate_headers.py b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/generator/generate_headers.py similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/generator/generate_headers.py rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/generator/generate_headers.py diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/generator/generate_headers.sh b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/generator/generate_headers.sh similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/generator/generate_headers.sh rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/generator/generate_headers.sh diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/generator/generator.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/generator/generator.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/generator/generator.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/generator/generator.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/AVCodecIDLookup.inl b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/AVCodecIDLookup.inl similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/AVCodecIDLookup.inl rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/AVCodecIDLookup.inl diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/DynamicLibraryHelpers.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/DynamicLibraryHelpers.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/DynamicLibraryHelpers.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/DynamicLibraryHelpers.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/DynamicLibraryHelpers.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/DynamicLibraryHelpers.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/DynamicLibraryHelpers.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/DynamicLibraryHelpers.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/FFmpegAPIResolver.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/FFmpegAPIResolver.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/FFmpegAPIResolver.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/FFmpegAPIResolver.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/FFmpegAPIResolver.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/FFmpegAPIResolver.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/FFmpegAPIResolver.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/FFmpegAPIResolver.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/FFmpegLog.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/FFmpegLog.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/FFmpegLog.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/FFmpegLog.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/55/AVCodecIDLookup.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/55/AVCodecIDLookup.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/55/AVCodecIDLookup.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/55/AVCodecIDLookup.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/55/AVCodecImpl.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/55/AVCodecImpl.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/55/AVCodecImpl.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/55/AVCodecImpl.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/57/AVCodecIDLookup.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/57/AVCodecIDLookup.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/57/AVCodecIDLookup.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/57/AVCodecIDLookup.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/57/AVCodecImpl.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/57/AVCodecImpl.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/57/AVCodecImpl.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/57/AVCodecImpl.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/58/AVCodecIDLookup.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/58/AVCodecIDLookup.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/58/AVCodecIDLookup.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/58/AVCodecIDLookup.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/58/AVCodecImpl.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/58/AVCodecImpl.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/58/AVCodecImpl.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/58/AVCodecImpl.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/59/AVCodecIDLookup.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/59/AVCodecIDLookup.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/59/AVCodecIDLookup.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/59/AVCodecIDLookup.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/59/AVCodecImpl.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/59/AVCodecImpl.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/59/AVCodecImpl.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/59/AVCodecImpl.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/60/AVCodecIDLookup.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/60/AVCodecIDLookup.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/60/AVCodecIDLookup.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/60/AVCodecIDLookup.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/60/AVCodecImpl.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/60/AVCodecImpl.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/60/AVCodecImpl.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/60/AVCodecImpl.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVCodecContextWrapperImpl.inl b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVCodecContextWrapperImpl.inl similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVCodecContextWrapperImpl.inl rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVCodecContextWrapperImpl.inl diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVCodecFunctionsLoader.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVCodecFunctionsLoader.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVCodecFunctionsLoader.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVCodecFunctionsLoader.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVCodecFunctionsLoader.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVCodecFunctionsLoader.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVCodecFunctionsLoader.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVCodecFunctionsLoader.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVCodecWrapperImpl.inl b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVCodecWrapperImpl.inl similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVCodecWrapperImpl.inl rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVCodecWrapperImpl.inl diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVPacketWrapperImpl.inl b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVPacketWrapperImpl.inl similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVPacketWrapperImpl.inl rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avcodec/AVPacketWrapperImpl.inl diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/55/AVFormatImpl.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/55/AVFormatImpl.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/55/AVFormatImpl.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/55/AVFormatImpl.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/57/AVFormatImpl.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/57/AVFormatImpl.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/57/AVFormatImpl.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/57/AVFormatImpl.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/58/AVFormatImpl.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/58/AVFormatImpl.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/58/AVFormatImpl.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/58/AVFormatImpl.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/59/AVFormatImpl.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/59/AVFormatImpl.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/59/AVFormatImpl.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/59/AVFormatImpl.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/60/AVFormatImpl.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/60/AVFormatImpl.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/60/AVFormatImpl.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/60/AVFormatImpl.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVFormatContextWrapperImpl.inl b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVFormatContextWrapperImpl.inl similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVFormatContextWrapperImpl.inl rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVFormatContextWrapperImpl.inl diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVFormatFunctionsLoader.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVFormatFunctionsLoader.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVFormatFunctionsLoader.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVFormatFunctionsLoader.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVFormatFunctionsLoader.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVFormatFunctionsLoader.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVFormatFunctionsLoader.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVFormatFunctionsLoader.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVIOContextWrapperImpl.inl b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVIOContextWrapperImpl.inl similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVIOContextWrapperImpl.inl rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVIOContextWrapperImpl.inl diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVInputFormatWrapperImpl.inl b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVInputFormatWrapperImpl.inl similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVInputFormatWrapperImpl.inl rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVInputFormatWrapperImpl.inl diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVOutputFormatWrapperImpl.inl b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVOutputFormatWrapperImpl.inl similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVOutputFormatWrapperImpl.inl rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVOutputFormatWrapperImpl.inl diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVStreamWrapperImpl.inl b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVStreamWrapperImpl.inl similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVStreamWrapperImpl.inl rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avformat/AVStreamWrapperImpl.inl diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/52/AVUtilImpl.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/52/AVUtilImpl.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/52/AVUtilImpl.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/52/AVUtilImpl.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/52/avconfig.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/52/avconfig.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/52/avconfig.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/52/avconfig.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/55/AVUtilImpl.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/55/AVUtilImpl.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/55/AVUtilImpl.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/55/AVUtilImpl.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/55/avconfig.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/55/avconfig.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/55/avconfig.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/55/avconfig.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/56/AVUtilImpl.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/56/AVUtilImpl.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/56/AVUtilImpl.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/56/AVUtilImpl.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/56/avconfig.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/56/avconfig.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/56/avconfig.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/56/avconfig.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/57/AVUtilImpl.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/57/AVUtilImpl.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/57/AVUtilImpl.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/57/AVUtilImpl.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/57/avconfig.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/57/avconfig.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/57/avconfig.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/57/avconfig.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/58/AVUtilImpl.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/58/AVUtilImpl.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/58/AVUtilImpl.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/58/AVUtilImpl.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/58/avconfig.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/58/avconfig.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/58/avconfig.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/58/avconfig.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/AVFrameWrapperImpl.inl b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/AVFrameWrapperImpl.inl similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/AVFrameWrapperImpl.inl rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/AVFrameWrapperImpl.inl diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/AVUtilFunctionsLoader.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/AVUtilFunctionsLoader.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/AVUtilFunctionsLoader.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/AVUtilFunctionsLoader.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/AVUtilFunctionsLoader.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/AVUtilFunctionsLoader.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/AVUtilFunctionsLoader.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/AVUtilFunctionsLoader.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/FFmpegLogImpl.inl b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/FFmpegLogImpl.inl similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/FFmpegLogImpl.inl rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/avutil/FFmpegLogImpl.inl diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-2.3.6-single-header.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-2.3.6-single-header.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-2.3.6-single-header.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-2.3.6-single-header.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-3.4.8-single-header.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-3.4.8-single-header.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-3.4.8-single-header.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-3.4.8-single-header.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-4.2.4-single-header.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-4.2.4-single-header.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-4.2.4-single-header.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-4.2.4-single-header.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-5.0.1-single-header.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-5.0.1-single-header.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-5.0.1-single-header.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-5.0.1-single-header.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-6.0.0-single-header.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-6.0.0-single-header.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-6.0.0-single-header.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-6.0.0-single-header.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVCodecContextWrapper.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVCodecContextWrapper.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVCodecContextWrapper.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVCodecContextWrapper.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVCodecContextWrapper.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVCodecContextWrapper.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVCodecContextWrapper.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVCodecContextWrapper.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVCodecWrapper.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVCodecWrapper.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVCodecWrapper.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVCodecWrapper.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVCodecWrapper.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVCodecWrapper.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVCodecWrapper.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVCodecWrapper.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVDictionaryWrapper.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVDictionaryWrapper.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVDictionaryWrapper.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVDictionaryWrapper.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVDictionaryWrapper.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVDictionaryWrapper.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVDictionaryWrapper.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVDictionaryWrapper.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFifoBufferWrapper.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFifoBufferWrapper.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFifoBufferWrapper.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFifoBufferWrapper.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFifoBufferWrapper.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFifoBufferWrapper.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFifoBufferWrapper.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFifoBufferWrapper.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFormatContextWrapper.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFormatContextWrapper.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFormatContextWrapper.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFormatContextWrapper.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFormatContextWrapper.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFormatContextWrapper.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFormatContextWrapper.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFormatContextWrapper.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFrameWrapper.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFrameWrapper.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFrameWrapper.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFrameWrapper.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFrameWrapper.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFrameWrapper.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFrameWrapper.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVFrameWrapper.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVIOContextWrapper.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVIOContextWrapper.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVIOContextWrapper.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVIOContextWrapper.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVIOContextWrapper.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVIOContextWrapper.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVIOContextWrapper.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVIOContextWrapper.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVInputFormatWrapper.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVInputFormatWrapper.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVInputFormatWrapper.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVInputFormatWrapper.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVInputFormatWrapper.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVInputFormatWrapper.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVInputFormatWrapper.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVInputFormatWrapper.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVOutputFormatWrapper.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVOutputFormatWrapper.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVOutputFormatWrapper.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVOutputFormatWrapper.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVOutputFormatWrapper.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVOutputFormatWrapper.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVOutputFormatWrapper.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVOutputFormatWrapper.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVPacketWrapper.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVPacketWrapper.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVPacketWrapper.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVPacketWrapper.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVPacketWrapper.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVPacketWrapper.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVPacketWrapper.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVPacketWrapper.h diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVStreamWrapper.cpp b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVStreamWrapper.cpp similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVStreamWrapper.cpp rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVStreamWrapper.cpp diff --git a/modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVStreamWrapper.h b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVStreamWrapper.h similarity index 100% rename from modules/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVStreamWrapper.h rename to modules/import-export/mod-ffmpeg/lib-ffmpeg-support/wrappers/AVStreamWrapper.h diff --git a/modules/mod-flac/CMakeLists.txt b/modules/import-export/mod-flac/CMakeLists.txt similarity index 100% rename from modules/mod-flac/CMakeLists.txt rename to modules/import-export/mod-flac/CMakeLists.txt diff --git a/modules/mod-flac/ExportFLAC.cpp b/modules/import-export/mod-flac/ExportFLAC.cpp similarity index 100% rename from modules/mod-flac/ExportFLAC.cpp rename to modules/import-export/mod-flac/ExportFLAC.cpp diff --git a/modules/mod-flac/FLAC.cpp b/modules/import-export/mod-flac/FLAC.cpp similarity index 100% rename from modules/mod-flac/FLAC.cpp rename to modules/import-export/mod-flac/FLAC.cpp diff --git a/modules/mod-flac/ImportFLAC.cpp b/modules/import-export/mod-flac/ImportFLAC.cpp similarity index 100% rename from modules/mod-flac/ImportFLAC.cpp rename to modules/import-export/mod-flac/ImportFLAC.cpp diff --git a/modules/mod-lof/CMakeLists.txt b/modules/import-export/mod-lof/CMakeLists.txt similarity index 100% rename from modules/mod-lof/CMakeLists.txt rename to modules/import-export/mod-lof/CMakeLists.txt diff --git a/modules/mod-lof/ImportLOF.cpp b/modules/import-export/mod-lof/ImportLOF.cpp similarity index 100% rename from modules/mod-lof/ImportLOF.cpp rename to modules/import-export/mod-lof/ImportLOF.cpp diff --git a/modules/mod-lof/LOF.cpp b/modules/import-export/mod-lof/LOF.cpp similarity index 100% rename from modules/mod-lof/LOF.cpp rename to modules/import-export/mod-lof/LOF.cpp diff --git a/modules/mod-mp2/CMakeLists.txt b/modules/import-export/mod-mp2/CMakeLists.txt similarity index 100% rename from modules/mod-mp2/CMakeLists.txt rename to modules/import-export/mod-mp2/CMakeLists.txt diff --git a/modules/mod-mp2/ExportMP2.cpp b/modules/import-export/mod-mp2/ExportMP2.cpp similarity index 100% rename from modules/mod-mp2/ExportMP2.cpp rename to modules/import-export/mod-mp2/ExportMP2.cpp diff --git a/modules/mod-mp2/MP2.cpp b/modules/import-export/mod-mp2/MP2.cpp similarity index 100% rename from modules/mod-mp2/MP2.cpp rename to modules/import-export/mod-mp2/MP2.cpp diff --git a/modules/mod-mp3/CMakeLists.txt b/modules/import-export/mod-mp3/CMakeLists.txt similarity index 100% rename from modules/mod-mp3/CMakeLists.txt rename to modules/import-export/mod-mp3/CMakeLists.txt diff --git a/modules/mod-mp3/ExportMP3.cpp b/modules/import-export/mod-mp3/ExportMP3.cpp similarity index 100% rename from modules/mod-mp3/ExportMP3.cpp rename to modules/import-export/mod-mp3/ExportMP3.cpp diff --git a/modules/mod-mp3/ExportMP3.h b/modules/import-export/mod-mp3/ExportMP3.h similarity index 100% rename from modules/mod-mp3/ExportMP3.h rename to modules/import-export/mod-mp3/ExportMP3.h diff --git a/modules/mod-mp3/MP3.cpp b/modules/import-export/mod-mp3/MP3.cpp similarity index 100% rename from modules/mod-mp3/MP3.cpp rename to modules/import-export/mod-mp3/MP3.cpp diff --git a/modules/mod-mp3/MP3Prefs.cpp b/modules/import-export/mod-mp3/MP3Prefs.cpp similarity index 100% rename from modules/mod-mp3/MP3Prefs.cpp rename to modules/import-export/mod-mp3/MP3Prefs.cpp diff --git a/modules/mod-mpg123/CMakeLists.txt b/modules/import-export/mod-mpg123/CMakeLists.txt similarity index 100% rename from modules/mod-mpg123/CMakeLists.txt rename to modules/import-export/mod-mpg123/CMakeLists.txt diff --git a/modules/mod-mpg123/ImportMP3_MPG123.cpp b/modules/import-export/mod-mpg123/ImportMP3_MPG123.cpp similarity index 100% rename from modules/mod-mpg123/ImportMP3_MPG123.cpp rename to modules/import-export/mod-mpg123/ImportMP3_MPG123.cpp diff --git a/modules/mod-mpg123/MPG123.cpp b/modules/import-export/mod-mpg123/MPG123.cpp similarity index 100% rename from modules/mod-mpg123/MPG123.cpp rename to modules/import-export/mod-mpg123/MPG123.cpp diff --git a/modules/mod-ogg/CMakeLists.txt b/modules/import-export/mod-ogg/CMakeLists.txt similarity index 100% rename from modules/mod-ogg/CMakeLists.txt rename to modules/import-export/mod-ogg/CMakeLists.txt diff --git a/modules/mod-ogg/ExportOGG.cpp b/modules/import-export/mod-ogg/ExportOGG.cpp similarity index 100% rename from modules/mod-ogg/ExportOGG.cpp rename to modules/import-export/mod-ogg/ExportOGG.cpp diff --git a/modules/mod-ogg/ImportOGG.cpp b/modules/import-export/mod-ogg/ImportOGG.cpp similarity index 100% rename from modules/mod-ogg/ImportOGG.cpp rename to modules/import-export/mod-ogg/ImportOGG.cpp diff --git a/modules/mod-ogg/OGG.cpp b/modules/import-export/mod-ogg/OGG.cpp similarity index 100% rename from modules/mod-ogg/OGG.cpp rename to modules/import-export/mod-ogg/OGG.cpp diff --git a/modules/mod-opus/CMakeLists.txt b/modules/import-export/mod-opus/CMakeLists.txt similarity index 100% rename from modules/mod-opus/CMakeLists.txt rename to modules/import-export/mod-opus/CMakeLists.txt diff --git a/modules/mod-opus/ExportOpus.cpp b/modules/import-export/mod-opus/ExportOpus.cpp similarity index 100% rename from modules/mod-opus/ExportOpus.cpp rename to modules/import-export/mod-opus/ExportOpus.cpp diff --git a/modules/mod-opus/ImportOpus.cpp b/modules/import-export/mod-opus/ImportOpus.cpp similarity index 100% rename from modules/mod-opus/ImportOpus.cpp rename to modules/import-export/mod-opus/ImportOpus.cpp diff --git a/modules/mod-opus/Opus.cpp b/modules/import-export/mod-opus/Opus.cpp similarity index 100% rename from modules/mod-opus/Opus.cpp rename to modules/import-export/mod-opus/Opus.cpp diff --git a/modules/mod-pcm/CMakeLists.txt b/modules/import-export/mod-pcm/CMakeLists.txt similarity index 100% rename from modules/mod-pcm/CMakeLists.txt rename to modules/import-export/mod-pcm/CMakeLists.txt diff --git a/modules/mod-pcm/ExportPCM.cpp b/modules/import-export/mod-pcm/ExportPCM.cpp similarity index 100% rename from modules/mod-pcm/ExportPCM.cpp rename to modules/import-export/mod-pcm/ExportPCM.cpp diff --git a/modules/mod-pcm/ImportPCM.cpp b/modules/import-export/mod-pcm/ImportPCM.cpp similarity index 100% rename from modules/mod-pcm/ImportPCM.cpp rename to modules/import-export/mod-pcm/ImportPCM.cpp diff --git a/modules/mod-pcm/PCM.cpp b/modules/import-export/mod-pcm/PCM.cpp similarity index 100% rename from modules/mod-pcm/PCM.cpp rename to modules/import-export/mod-pcm/PCM.cpp diff --git a/modules/mod-wavpack/CMakeLists.txt b/modules/import-export/mod-wavpack/CMakeLists.txt similarity index 100% rename from modules/mod-wavpack/CMakeLists.txt rename to modules/import-export/mod-wavpack/CMakeLists.txt diff --git a/modules/mod-wavpack/ExportWavPack.cpp b/modules/import-export/mod-wavpack/ExportWavPack.cpp similarity index 100% rename from modules/mod-wavpack/ExportWavPack.cpp rename to modules/import-export/mod-wavpack/ExportWavPack.cpp diff --git a/modules/mod-wavpack/ImportWavPack.cpp b/modules/import-export/mod-wavpack/ImportWavPack.cpp similarity index 100% rename from modules/mod-wavpack/ImportWavPack.cpp rename to modules/import-export/mod-wavpack/ImportWavPack.cpp diff --git a/modules/mod-wavpack/WavPack.cpp b/modules/import-export/mod-wavpack/WavPack.cpp similarity index 100% rename from modules/mod-wavpack/WavPack.cpp rename to modules/import-export/mod-wavpack/WavPack.cpp diff --git a/modules/nyquist/CMakeLists.txt b/modules/nyquist/CMakeLists.txt new file mode 100644 index 000000000000..004cbb8f23e7 --- /dev/null +++ b/modules/nyquist/CMakeLists.txt @@ -0,0 +1,14 @@ +# Include the modules that we'll build + +# The list of modules is ordered so that each module occurs after any others +# that it depends on +set( MODULES +) + +if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows" ) + list( APPEND MODULES + mod-nyq-bench + ) +endif() + +audacity_module_subdirectory("${MODULES}") diff --git a/modules/mod-nyq-bench/CMakeLists.txt b/modules/nyquist/mod-nyq-bench/CMakeLists.txt similarity index 100% rename from modules/mod-nyq-bench/CMakeLists.txt rename to modules/nyquist/mod-nyq-bench/CMakeLists.txt diff --git a/modules/mod-nyq-bench/NyqBench.cpp b/modules/nyquist/mod-nyq-bench/NyqBench.cpp similarity index 100% rename from modules/mod-nyq-bench/NyqBench.cpp rename to modules/nyquist/mod-nyq-bench/NyqBench.cpp diff --git a/modules/mod-nyq-bench/NyqBench.h b/modules/nyquist/mod-nyq-bench/NyqBench.h similarity index 100% rename from modules/mod-nyq-bench/NyqBench.h rename to modules/nyquist/mod-nyq-bench/NyqBench.h diff --git a/modules/mod-nyq-bench/Readme.txt b/modules/nyquist/mod-nyq-bench/Readme.txt similarity index 100% rename from modules/mod-nyq-bench/Readme.txt rename to modules/nyquist/mod-nyq-bench/Readme.txt diff --git a/modules/mod-nyq-bench/images/document-new-large.xpm b/modules/nyquist/mod-nyq-bench/images/document-new-large.xpm similarity index 100% rename from modules/mod-nyq-bench/images/document-new-large.xpm rename to modules/nyquist/mod-nyq-bench/images/document-new-large.xpm diff --git a/modules/mod-nyq-bench/images/document-new-small.xpm b/modules/nyquist/mod-nyq-bench/images/document-new-small.xpm similarity index 100% rename from modules/mod-nyq-bench/images/document-new-small.xpm rename to modules/nyquist/mod-nyq-bench/images/document-new-small.xpm diff --git a/modules/mod-nyq-bench/images/document-open-large.xpm b/modules/nyquist/mod-nyq-bench/images/document-open-large.xpm similarity index 100% rename from modules/mod-nyq-bench/images/document-open-large.xpm rename to modules/nyquist/mod-nyq-bench/images/document-open-large.xpm diff --git a/modules/mod-nyq-bench/images/document-open-small.xpm b/modules/nyquist/mod-nyq-bench/images/document-open-small.xpm similarity index 100% rename from modules/mod-nyq-bench/images/document-open-small.xpm rename to modules/nyquist/mod-nyq-bench/images/document-open-small.xpm diff --git a/modules/mod-nyq-bench/images/document-save-as-large.xpm b/modules/nyquist/mod-nyq-bench/images/document-save-as-large.xpm similarity index 100% rename from modules/mod-nyq-bench/images/document-save-as-large.xpm rename to modules/nyquist/mod-nyq-bench/images/document-save-as-large.xpm diff --git a/modules/mod-nyq-bench/images/document-save-as-small.xpm b/modules/nyquist/mod-nyq-bench/images/document-save-as-small.xpm similarity index 100% rename from modules/mod-nyq-bench/images/document-save-as-small.xpm rename to modules/nyquist/mod-nyq-bench/images/document-save-as-small.xpm diff --git a/modules/mod-nyq-bench/images/document-save-large.xpm b/modules/nyquist/mod-nyq-bench/images/document-save-large.xpm similarity index 100% rename from modules/mod-nyq-bench/images/document-save-large.xpm rename to modules/nyquist/mod-nyq-bench/images/document-save-large.xpm diff --git a/modules/mod-nyq-bench/images/document-save-small.xpm b/modules/nyquist/mod-nyq-bench/images/document-save-small.xpm similarity index 100% rename from modules/mod-nyq-bench/images/document-save-small.xpm rename to modules/nyquist/mod-nyq-bench/images/document-save-small.xpm diff --git a/modules/mod-nyq-bench/images/edit-clear-large.xpm b/modules/nyquist/mod-nyq-bench/images/edit-clear-large.xpm similarity index 100% rename from modules/mod-nyq-bench/images/edit-clear-large.xpm rename to modules/nyquist/mod-nyq-bench/images/edit-clear-large.xpm diff --git a/modules/mod-nyq-bench/images/edit-clear-small.xpm b/modules/nyquist/mod-nyq-bench/images/edit-clear-small.xpm similarity index 100% rename from modules/mod-nyq-bench/images/edit-clear-small.xpm rename to modules/nyquist/mod-nyq-bench/images/edit-clear-small.xpm diff --git a/modules/mod-nyq-bench/images/edit-copy-large.xpm b/modules/nyquist/mod-nyq-bench/images/edit-copy-large.xpm similarity index 100% rename from modules/mod-nyq-bench/images/edit-copy-large.xpm rename to modules/nyquist/mod-nyq-bench/images/edit-copy-large.xpm diff --git a/modules/mod-nyq-bench/images/edit-copy-small.xpm b/modules/nyquist/mod-nyq-bench/images/edit-copy-small.xpm similarity index 100% rename from modules/mod-nyq-bench/images/edit-copy-small.xpm rename to modules/nyquist/mod-nyq-bench/images/edit-copy-small.xpm diff --git a/modules/mod-nyq-bench/images/edit-cut-large.xpm b/modules/nyquist/mod-nyq-bench/images/edit-cut-large.xpm similarity index 100% rename from modules/mod-nyq-bench/images/edit-cut-large.xpm rename to modules/nyquist/mod-nyq-bench/images/edit-cut-large.xpm diff --git a/modules/mod-nyq-bench/images/edit-cut-small.xpm b/modules/nyquist/mod-nyq-bench/images/edit-cut-small.xpm similarity index 100% rename from modules/mod-nyq-bench/images/edit-cut-small.xpm rename to modules/nyquist/mod-nyq-bench/images/edit-cut-small.xpm diff --git a/modules/mod-nyq-bench/images/edit-delete-large.xpm b/modules/nyquist/mod-nyq-bench/images/edit-delete-large.xpm similarity index 100% rename from modules/mod-nyq-bench/images/edit-delete-large.xpm rename to modules/nyquist/mod-nyq-bench/images/edit-delete-large.xpm diff --git a/modules/mod-nyq-bench/images/edit-delete-small.xpm b/modules/nyquist/mod-nyq-bench/images/edit-delete-small.xpm similarity index 100% rename from modules/mod-nyq-bench/images/edit-delete-small.xpm rename to modules/nyquist/mod-nyq-bench/images/edit-delete-small.xpm diff --git a/modules/mod-nyq-bench/images/edit-find-large.xpm b/modules/nyquist/mod-nyq-bench/images/edit-find-large.xpm similarity index 100% rename from modules/mod-nyq-bench/images/edit-find-large.xpm rename to modules/nyquist/mod-nyq-bench/images/edit-find-large.xpm diff --git a/modules/mod-nyq-bench/images/edit-find-small.xpm b/modules/nyquist/mod-nyq-bench/images/edit-find-small.xpm similarity index 100% rename from modules/mod-nyq-bench/images/edit-find-small.xpm rename to modules/nyquist/mod-nyq-bench/images/edit-find-small.xpm diff --git a/modules/mod-nyq-bench/images/edit-paste-large.xpm b/modules/nyquist/mod-nyq-bench/images/edit-paste-large.xpm similarity index 100% rename from modules/mod-nyq-bench/images/edit-paste-large.xpm rename to modules/nyquist/mod-nyq-bench/images/edit-paste-large.xpm diff --git a/modules/mod-nyq-bench/images/edit-paste-small.xpm b/modules/nyquist/mod-nyq-bench/images/edit-paste-small.xpm similarity index 100% rename from modules/mod-nyq-bench/images/edit-paste-small.xpm rename to modules/nyquist/mod-nyq-bench/images/edit-paste-small.xpm diff --git a/modules/mod-nyq-bench/images/edit-redo-large.xpm b/modules/nyquist/mod-nyq-bench/images/edit-redo-large.xpm similarity index 100% rename from modules/mod-nyq-bench/images/edit-redo-large.xpm rename to modules/nyquist/mod-nyq-bench/images/edit-redo-large.xpm diff --git a/modules/mod-nyq-bench/images/edit-redo-small.xpm b/modules/nyquist/mod-nyq-bench/images/edit-redo-small.xpm similarity index 100% rename from modules/mod-nyq-bench/images/edit-redo-small.xpm rename to modules/nyquist/mod-nyq-bench/images/edit-redo-small.xpm diff --git a/modules/mod-nyq-bench/images/edit-select-all-large.xpm b/modules/nyquist/mod-nyq-bench/images/edit-select-all-large.xpm similarity index 100% rename from modules/mod-nyq-bench/images/edit-select-all-large.xpm rename to modules/nyquist/mod-nyq-bench/images/edit-select-all-large.xpm diff --git a/modules/mod-nyq-bench/images/edit-select-all-small.xpm b/modules/nyquist/mod-nyq-bench/images/edit-select-all-small.xpm similarity index 100% rename from modules/mod-nyq-bench/images/edit-select-all-small.xpm rename to modules/nyquist/mod-nyq-bench/images/edit-select-all-small.xpm diff --git a/modules/mod-nyq-bench/images/edit-undo-large.xpm b/modules/nyquist/mod-nyq-bench/images/edit-undo-large.xpm similarity index 100% rename from modules/mod-nyq-bench/images/edit-undo-large.xpm rename to modules/nyquist/mod-nyq-bench/images/edit-undo-large.xpm diff --git a/modules/mod-nyq-bench/images/edit-undo-small.xpm b/modules/nyquist/mod-nyq-bench/images/edit-undo-small.xpm similarity index 100% rename from modules/mod-nyq-bench/images/edit-undo-small.xpm rename to modules/nyquist/mod-nyq-bench/images/edit-undo-small.xpm diff --git a/modules/mod-nyq-bench/images/go-next-large.xpm b/modules/nyquist/mod-nyq-bench/images/go-next-large.xpm similarity index 100% rename from modules/mod-nyq-bench/images/go-next-large.xpm rename to modules/nyquist/mod-nyq-bench/images/go-next-large.xpm diff --git a/modules/mod-nyq-bench/images/go-next-small.xpm b/modules/nyquist/mod-nyq-bench/images/go-next-small.xpm similarity index 100% rename from modules/mod-nyq-bench/images/go-next-small.xpm rename to modules/nyquist/mod-nyq-bench/images/go-next-small.xpm diff --git a/modules/mod-nyq-bench/images/go-previous-large.xpm b/modules/nyquist/mod-nyq-bench/images/go-previous-large.xpm similarity index 100% rename from modules/mod-nyq-bench/images/go-previous-large.xpm rename to modules/nyquist/mod-nyq-bench/images/go-previous-large.xpm diff --git a/modules/mod-nyq-bench/images/go-previous-small.xpm b/modules/nyquist/mod-nyq-bench/images/go-previous-small.xpm similarity index 100% rename from modules/mod-nyq-bench/images/go-previous-small.xpm rename to modules/nyquist/mod-nyq-bench/images/go-previous-small.xpm diff --git a/modules/mod-nyq-bench/images/go-top-large.xpm b/modules/nyquist/mod-nyq-bench/images/go-top-large.xpm similarity index 100% rename from modules/mod-nyq-bench/images/go-top-large.xpm rename to modules/nyquist/mod-nyq-bench/images/go-top-large.xpm diff --git a/modules/mod-nyq-bench/images/go-top-small.xpm b/modules/nyquist/mod-nyq-bench/images/go-top-small.xpm similarity index 100% rename from modules/mod-nyq-bench/images/go-top-small.xpm rename to modules/nyquist/mod-nyq-bench/images/go-top-small.xpm diff --git a/modules/mod-nyq-bench/images/go-up-large.xpm b/modules/nyquist/mod-nyq-bench/images/go-up-large.xpm similarity index 100% rename from modules/mod-nyq-bench/images/go-up-large.xpm rename to modules/nyquist/mod-nyq-bench/images/go-up-large.xpm diff --git a/modules/mod-nyq-bench/images/go-up-small.xpm b/modules/nyquist/mod-nyq-bench/images/go-up-small.xpm similarity index 100% rename from modules/mod-nyq-bench/images/go-up-small.xpm rename to modules/nyquist/mod-nyq-bench/images/go-up-small.xpm diff --git a/modules/mod-nyq-bench/images/media-playback-pause-large.xpm b/modules/nyquist/mod-nyq-bench/images/media-playback-pause-large.xpm similarity index 100% rename from modules/mod-nyq-bench/images/media-playback-pause-large.xpm rename to modules/nyquist/mod-nyq-bench/images/media-playback-pause-large.xpm diff --git a/modules/mod-nyq-bench/images/media-playback-pause-small.xpm b/modules/nyquist/mod-nyq-bench/images/media-playback-pause-small.xpm similarity index 100% rename from modules/mod-nyq-bench/images/media-playback-pause-small.xpm rename to modules/nyquist/mod-nyq-bench/images/media-playback-pause-small.xpm diff --git a/modules/mod-nyq-bench/images/media-playback-start-large.xpm b/modules/nyquist/mod-nyq-bench/images/media-playback-start-large.xpm similarity index 100% rename from modules/mod-nyq-bench/images/media-playback-start-large.xpm rename to modules/nyquist/mod-nyq-bench/images/media-playback-start-large.xpm diff --git a/modules/mod-nyq-bench/images/media-playback-start-small.xpm b/modules/nyquist/mod-nyq-bench/images/media-playback-start-small.xpm similarity index 100% rename from modules/mod-nyq-bench/images/media-playback-start-small.xpm rename to modules/nyquist/mod-nyq-bench/images/media-playback-start-small.xpm diff --git a/modules/mod-nyq-bench/images/media-playback-stop-large.xpm b/modules/nyquist/mod-nyq-bench/images/media-playback-stop-large.xpm similarity index 100% rename from modules/mod-nyq-bench/images/media-playback-stop-large.xpm rename to modules/nyquist/mod-nyq-bench/images/media-playback-stop-large.xpm diff --git a/modules/mod-nyq-bench/images/media-playback-stop-small.xpm b/modules/nyquist/mod-nyq-bench/images/media-playback-stop-small.xpm similarity index 100% rename from modules/mod-nyq-bench/images/media-playback-stop-small.xpm rename to modules/nyquist/mod-nyq-bench/images/media-playback-stop-small.xpm diff --git a/modules/mod-nyq-bench/images/system-search-large.xpm b/modules/nyquist/mod-nyq-bench/images/system-search-large.xpm similarity index 100% rename from modules/mod-nyq-bench/images/system-search-large.xpm rename to modules/nyquist/mod-nyq-bench/images/system-search-large.xpm diff --git a/modules/mod-nyq-bench/images/system-search-small.xpm b/modules/nyquist/mod-nyq-bench/images/system-search-small.xpm similarity index 100% rename from modules/mod-nyq-bench/images/system-search-small.xpm rename to modules/nyquist/mod-nyq-bench/images/system-search-small.xpm diff --git a/modules/scripting/CMakeLists.txt b/modules/scripting/CMakeLists.txt new file mode 100644 index 000000000000..cccb25c77e68 --- /dev/null +++ b/modules/scripting/CMakeLists.txt @@ -0,0 +1,9 @@ +# Include the modules that we'll build + +# The list of modules is ordered so that each module occurs after any others +# that it depends on +set( MODULES + mod-script-pipe +) + +audacity_module_subdirectory("${MODULES}") diff --git a/modules/mod-script-pipe/CMakeLists.txt b/modules/scripting/mod-script-pipe/CMakeLists.txt similarity index 100% rename from modules/mod-script-pipe/CMakeLists.txt rename to modules/scripting/mod-script-pipe/CMakeLists.txt diff --git a/modules/mod-script-pipe/PipeServer.cpp b/modules/scripting/mod-script-pipe/PipeServer.cpp similarity index 100% rename from modules/mod-script-pipe/PipeServer.cpp rename to modules/scripting/mod-script-pipe/PipeServer.cpp diff --git a/modules/mod-script-pipe/ScripterCallback.cpp b/modules/scripting/mod-script-pipe/ScripterCallback.cpp similarity index 100% rename from modules/mod-script-pipe/ScripterCallback.cpp rename to modules/scripting/mod-script-pipe/ScripterCallback.cpp diff --git a/modules/mod-script-pipe/ScripterCallback.h b/modules/scripting/mod-script-pipe/ScripterCallback.h similarity index 100% rename from modules/mod-script-pipe/ScripterCallback.h rename to modules/scripting/mod-script-pipe/ScripterCallback.h diff --git a/modules/sharing/CMakeLists.txt b/modules/sharing/CMakeLists.txt new file mode 100644 index 000000000000..879f33aae873 --- /dev/null +++ b/modules/sharing/CMakeLists.txt @@ -0,0 +1,9 @@ +# Include the modules that we'll build + +# The list of modules is ordered so that each module occurs after any others +# that it depends on +set( MODULES + mod-cloud-audiocom +) + +audacity_module_subdirectory("${MODULES}") diff --git a/modules/mod-cloud-audiocom/AudioComModule.cpp b/modules/sharing/mod-cloud-audiocom/AudioComModule.cpp similarity index 100% rename from modules/mod-cloud-audiocom/AudioComModule.cpp rename to modules/sharing/mod-cloud-audiocom/AudioComModule.cpp diff --git a/modules/mod-cloud-audiocom/AuthorizationHandler.cpp b/modules/sharing/mod-cloud-audiocom/AuthorizationHandler.cpp similarity index 100% rename from modules/mod-cloud-audiocom/AuthorizationHandler.cpp rename to modules/sharing/mod-cloud-audiocom/AuthorizationHandler.cpp diff --git a/modules/mod-cloud-audiocom/AuthorizationHandler.h b/modules/sharing/mod-cloud-audiocom/AuthorizationHandler.h similarity index 100% rename from modules/mod-cloud-audiocom/AuthorizationHandler.h rename to modules/sharing/mod-cloud-audiocom/AuthorizationHandler.h diff --git a/modules/mod-cloud-audiocom/CMakeLists.txt b/modules/sharing/mod-cloud-audiocom/CMakeLists.txt similarity index 100% rename from modules/mod-cloud-audiocom/CMakeLists.txt rename to modules/sharing/mod-cloud-audiocom/CMakeLists.txt diff --git a/modules/mod-cloud-audiocom/CloudModuleSettings.cpp b/modules/sharing/mod-cloud-audiocom/CloudModuleSettings.cpp similarity index 100% rename from modules/mod-cloud-audiocom/CloudModuleSettings.cpp rename to modules/sharing/mod-cloud-audiocom/CloudModuleSettings.cpp diff --git a/modules/mod-cloud-audiocom/CloudModuleSettings.h b/modules/sharing/mod-cloud-audiocom/CloudModuleSettings.h similarity index 100% rename from modules/mod-cloud-audiocom/CloudModuleSettings.h rename to modules/sharing/mod-cloud-audiocom/CloudModuleSettings.h diff --git a/modules/mod-cloud-audiocom/CloudProjectFileIOExtensions.cpp b/modules/sharing/mod-cloud-audiocom/CloudProjectFileIOExtensions.cpp similarity index 100% rename from modules/mod-cloud-audiocom/CloudProjectFileIOExtensions.cpp rename to modules/sharing/mod-cloud-audiocom/CloudProjectFileIOExtensions.cpp diff --git a/modules/mod-cloud-audiocom/CloudProjectFileIOExtensions.h b/modules/sharing/mod-cloud-audiocom/CloudProjectFileIOExtensions.h similarity index 100% rename from modules/mod-cloud-audiocom/CloudProjectFileIOExtensions.h rename to modules/sharing/mod-cloud-audiocom/CloudProjectFileIOExtensions.h diff --git a/modules/mod-cloud-audiocom/CloudProjectMixdownUtils.cpp b/modules/sharing/mod-cloud-audiocom/CloudProjectMixdownUtils.cpp similarity index 100% rename from modules/mod-cloud-audiocom/CloudProjectMixdownUtils.cpp rename to modules/sharing/mod-cloud-audiocom/CloudProjectMixdownUtils.cpp diff --git a/modules/mod-cloud-audiocom/CloudProjectMixdownUtils.h b/modules/sharing/mod-cloud-audiocom/CloudProjectMixdownUtils.h similarity index 100% rename from modules/mod-cloud-audiocom/CloudProjectMixdownUtils.h rename to modules/sharing/mod-cloud-audiocom/CloudProjectMixdownUtils.h diff --git a/modules/mod-cloud-audiocom/CloudProjectOpenUtils.cpp b/modules/sharing/mod-cloud-audiocom/CloudProjectOpenUtils.cpp similarity index 100% rename from modules/mod-cloud-audiocom/CloudProjectOpenUtils.cpp rename to modules/sharing/mod-cloud-audiocom/CloudProjectOpenUtils.cpp diff --git a/modules/mod-cloud-audiocom/CloudProjectOpenUtils.h b/modules/sharing/mod-cloud-audiocom/CloudProjectOpenUtils.h similarity index 100% rename from modules/mod-cloud-audiocom/CloudProjectOpenUtils.h rename to modules/sharing/mod-cloud-audiocom/CloudProjectOpenUtils.h diff --git a/modules/mod-cloud-audiocom/LinkUrlHandler.cpp b/modules/sharing/mod-cloud-audiocom/LinkUrlHandler.cpp similarity index 100% rename from modules/mod-cloud-audiocom/LinkUrlHandler.cpp rename to modules/sharing/mod-cloud-audiocom/LinkUrlHandler.cpp diff --git a/modules/mod-cloud-audiocom/menus/AudioComMenus.cpp b/modules/sharing/mod-cloud-audiocom/menus/AudioComMenus.cpp similarity index 100% rename from modules/mod-cloud-audiocom/menus/AudioComMenus.cpp rename to modules/sharing/mod-cloud-audiocom/menus/AudioComMenus.cpp diff --git a/modules/mod-cloud-audiocom/ui/AudioComPrefsPanel.cpp b/modules/sharing/mod-cloud-audiocom/ui/AudioComPrefsPanel.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/AudioComPrefsPanel.cpp rename to modules/sharing/mod-cloud-audiocom/ui/AudioComPrefsPanel.cpp diff --git a/modules/mod-cloud-audiocom/ui/CloudSyncStatusField.cpp b/modules/sharing/mod-cloud-audiocom/ui/CloudSyncStatusField.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/CloudSyncStatusField.cpp rename to modules/sharing/mod-cloud-audiocom/ui/CloudSyncStatusField.cpp diff --git a/modules/mod-cloud-audiocom/ui/CloudSyncStatusField.h b/modules/sharing/mod-cloud-audiocom/ui/CloudSyncStatusField.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/CloudSyncStatusField.h rename to modules/sharing/mod-cloud-audiocom/ui/CloudSyncStatusField.h diff --git a/modules/mod-cloud-audiocom/ui/ProjectCloudUIExtension.cpp b/modules/sharing/mod-cloud-audiocom/ui/ProjectCloudUIExtension.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/ProjectCloudUIExtension.cpp rename to modules/sharing/mod-cloud-audiocom/ui/ProjectCloudUIExtension.cpp diff --git a/modules/mod-cloud-audiocom/ui/ProjectCloudUIExtension.h b/modules/sharing/mod-cloud-audiocom/ui/ProjectCloudUIExtension.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/ProjectCloudUIExtension.h rename to modules/sharing/mod-cloud-audiocom/ui/ProjectCloudUIExtension.h diff --git a/modules/mod-cloud-audiocom/ui/ShareAudioToolbar.cpp b/modules/sharing/mod-cloud-audiocom/ui/ShareAudioToolbar.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/ShareAudioToolbar.cpp rename to modules/sharing/mod-cloud-audiocom/ui/ShareAudioToolbar.cpp diff --git a/modules/mod-cloud-audiocom/ui/ShareAudioToolbar.h b/modules/sharing/mod-cloud-audiocom/ui/ShareAudioToolbar.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/ShareAudioToolbar.h rename to modules/sharing/mod-cloud-audiocom/ui/ShareAudioToolbar.h diff --git a/modules/mod-cloud-audiocom/ui/UserImage.cpp b/modules/sharing/mod-cloud-audiocom/ui/UserImage.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/UserImage.cpp rename to modules/sharing/mod-cloud-audiocom/ui/UserImage.cpp diff --git a/modules/mod-cloud-audiocom/ui/UserImage.h b/modules/sharing/mod-cloud-audiocom/ui/UserImage.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/UserImage.h rename to modules/sharing/mod-cloud-audiocom/ui/UserImage.h diff --git a/modules/mod-cloud-audiocom/ui/UserPanel.cpp b/modules/sharing/mod-cloud-audiocom/ui/UserPanel.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/UserPanel.cpp rename to modules/sharing/mod-cloud-audiocom/ui/UserPanel.cpp diff --git a/modules/mod-cloud-audiocom/ui/UserPanel.h b/modules/sharing/mod-cloud-audiocom/ui/UserPanel.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/UserPanel.h rename to modules/sharing/mod-cloud-audiocom/ui/UserPanel.h diff --git a/modules/mod-cloud-audiocom/ui/dialogs/AudioComDialogBase.cpp b/modules/sharing/mod-cloud-audiocom/ui/dialogs/AudioComDialogBase.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/AudioComDialogBase.cpp rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/AudioComDialogBase.cpp diff --git a/modules/mod-cloud-audiocom/ui/dialogs/AudioComDialogBase.h b/modules/sharing/mod-cloud-audiocom/ui/dialogs/AudioComDialogBase.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/AudioComDialogBase.h rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/AudioComDialogBase.h diff --git a/modules/mod-cloud-audiocom/ui/dialogs/CloudLocationDialog.cpp b/modules/sharing/mod-cloud-audiocom/ui/dialogs/CloudLocationDialog.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/CloudLocationDialog.cpp rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/CloudLocationDialog.cpp diff --git a/modules/mod-cloud-audiocom/ui/dialogs/CloudLocationDialog.h b/modules/sharing/mod-cloud-audiocom/ui/dialogs/CloudLocationDialog.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/CloudLocationDialog.h rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/CloudLocationDialog.h diff --git a/modules/mod-cloud-audiocom/ui/dialogs/CloudProjectPropertiesDialog.cpp b/modules/sharing/mod-cloud-audiocom/ui/dialogs/CloudProjectPropertiesDialog.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/CloudProjectPropertiesDialog.cpp rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/CloudProjectPropertiesDialog.cpp diff --git a/modules/mod-cloud-audiocom/ui/dialogs/CloudProjectPropertiesDialog.h b/modules/sharing/mod-cloud-audiocom/ui/dialogs/CloudProjectPropertiesDialog.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/CloudProjectPropertiesDialog.h rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/CloudProjectPropertiesDialog.h diff --git a/modules/mod-cloud-audiocom/ui/dialogs/ConnectionIssuesDialog.cpp b/modules/sharing/mod-cloud-audiocom/ui/dialogs/ConnectionIssuesDialog.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/ConnectionIssuesDialog.cpp rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/ConnectionIssuesDialog.cpp diff --git a/modules/mod-cloud-audiocom/ui/dialogs/ConnectionIssuesDialog.h b/modules/sharing/mod-cloud-audiocom/ui/dialogs/ConnectionIssuesDialog.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/ConnectionIssuesDialog.h rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/ConnectionIssuesDialog.h diff --git a/modules/mod-cloud-audiocom/ui/dialogs/LinkAccountDialog.cpp b/modules/sharing/mod-cloud-audiocom/ui/dialogs/LinkAccountDialog.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/LinkAccountDialog.cpp rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/LinkAccountDialog.cpp diff --git a/modules/mod-cloud-audiocom/ui/dialogs/LinkAccountDialog.h b/modules/sharing/mod-cloud-audiocom/ui/dialogs/LinkAccountDialog.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/LinkAccountDialog.h rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/LinkAccountDialog.h diff --git a/modules/mod-cloud-audiocom/ui/dialogs/LinkFailedDialog.cpp b/modules/sharing/mod-cloud-audiocom/ui/dialogs/LinkFailedDialog.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/LinkFailedDialog.cpp rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/LinkFailedDialog.cpp diff --git a/modules/mod-cloud-audiocom/ui/dialogs/LinkFailedDialog.h b/modules/sharing/mod-cloud-audiocom/ui/dialogs/LinkFailedDialog.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/LinkFailedDialog.h rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/LinkFailedDialog.h diff --git a/modules/mod-cloud-audiocom/ui/dialogs/LinkSucceededDialog.cpp b/modules/sharing/mod-cloud-audiocom/ui/dialogs/LinkSucceededDialog.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/LinkSucceededDialog.cpp rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/LinkSucceededDialog.cpp diff --git a/modules/mod-cloud-audiocom/ui/dialogs/LinkSucceededDialog.h b/modules/sharing/mod-cloud-audiocom/ui/dialogs/LinkSucceededDialog.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/LinkSucceededDialog.h rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/LinkSucceededDialog.h diff --git a/modules/mod-cloud-audiocom/ui/dialogs/LinkWithTokenDialog.cpp b/modules/sharing/mod-cloud-audiocom/ui/dialogs/LinkWithTokenDialog.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/LinkWithTokenDialog.cpp rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/LinkWithTokenDialog.cpp diff --git a/modules/mod-cloud-audiocom/ui/dialogs/LinkWithTokenDialog.h b/modules/sharing/mod-cloud-audiocom/ui/dialogs/LinkWithTokenDialog.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/LinkWithTokenDialog.h rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/LinkWithTokenDialog.h diff --git a/modules/mod-cloud-audiocom/ui/dialogs/NotCloudProjectDialog.cpp b/modules/sharing/mod-cloud-audiocom/ui/dialogs/NotCloudProjectDialog.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/NotCloudProjectDialog.cpp rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/NotCloudProjectDialog.cpp diff --git a/modules/mod-cloud-audiocom/ui/dialogs/NotCloudProjectDialog.h b/modules/sharing/mod-cloud-audiocom/ui/dialogs/NotCloudProjectDialog.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/NotCloudProjectDialog.h rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/NotCloudProjectDialog.h diff --git a/modules/mod-cloud-audiocom/ui/dialogs/ProjectLimitDialog.cpp b/modules/sharing/mod-cloud-audiocom/ui/dialogs/ProjectLimitDialog.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/ProjectLimitDialog.cpp rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/ProjectLimitDialog.cpp diff --git a/modules/mod-cloud-audiocom/ui/dialogs/ProjectLimitDialog.h b/modules/sharing/mod-cloud-audiocom/ui/dialogs/ProjectLimitDialog.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/ProjectLimitDialog.h rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/ProjectLimitDialog.h diff --git a/modules/mod-cloud-audiocom/ui/dialogs/ProjectVersionConflictDialog.cpp b/modules/sharing/mod-cloud-audiocom/ui/dialogs/ProjectVersionConflictDialog.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/ProjectVersionConflictDialog.cpp rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/ProjectVersionConflictDialog.cpp diff --git a/modules/mod-cloud-audiocom/ui/dialogs/ProjectVersionConflictDialog.h b/modules/sharing/mod-cloud-audiocom/ui/dialogs/ProjectVersionConflictDialog.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/ProjectVersionConflictDialog.h rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/ProjectVersionConflictDialog.h diff --git a/modules/mod-cloud-audiocom/ui/dialogs/ProjectsListDialog.cpp b/modules/sharing/mod-cloud-audiocom/ui/dialogs/ProjectsListDialog.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/ProjectsListDialog.cpp rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/ProjectsListDialog.cpp diff --git a/modules/mod-cloud-audiocom/ui/dialogs/ProjectsListDialog.h b/modules/sharing/mod-cloud-audiocom/ui/dialogs/ProjectsListDialog.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/ProjectsListDialog.h rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/ProjectsListDialog.h diff --git a/modules/mod-cloud-audiocom/ui/dialogs/ShareAudioDialog.cpp b/modules/sharing/mod-cloud-audiocom/ui/dialogs/ShareAudioDialog.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/ShareAudioDialog.cpp rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/ShareAudioDialog.cpp diff --git a/modules/mod-cloud-audiocom/ui/dialogs/ShareAudioDialog.h b/modules/sharing/mod-cloud-audiocom/ui/dialogs/ShareAudioDialog.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/ShareAudioDialog.h rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/ShareAudioDialog.h diff --git a/modules/mod-cloud-audiocom/ui/dialogs/SyncFailedDialog.cpp b/modules/sharing/mod-cloud-audiocom/ui/dialogs/SyncFailedDialog.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/SyncFailedDialog.cpp rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/SyncFailedDialog.cpp diff --git a/modules/mod-cloud-audiocom/ui/dialogs/SyncFailedDialog.h b/modules/sharing/mod-cloud-audiocom/ui/dialogs/SyncFailedDialog.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/SyncFailedDialog.h rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/SyncFailedDialog.h diff --git a/modules/mod-cloud-audiocom/ui/dialogs/SyncInBackroundDialog.cpp b/modules/sharing/mod-cloud-audiocom/ui/dialogs/SyncInBackroundDialog.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/SyncInBackroundDialog.cpp rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/SyncInBackroundDialog.cpp diff --git a/modules/mod-cloud-audiocom/ui/dialogs/SyncInBackroundDialog.h b/modules/sharing/mod-cloud-audiocom/ui/dialogs/SyncInBackroundDialog.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/SyncInBackroundDialog.h rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/SyncInBackroundDialog.h diff --git a/modules/mod-cloud-audiocom/ui/dialogs/SyncSucceededDialog.cpp b/modules/sharing/mod-cloud-audiocom/ui/dialogs/SyncSucceededDialog.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/SyncSucceededDialog.cpp rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/SyncSucceededDialog.cpp diff --git a/modules/mod-cloud-audiocom/ui/dialogs/SyncSucceededDialog.h b/modules/sharing/mod-cloud-audiocom/ui/dialogs/SyncSucceededDialog.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/SyncSucceededDialog.h rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/SyncSucceededDialog.h diff --git a/modules/mod-cloud-audiocom/ui/dialogs/UnsyncedProjectDialog.cpp b/modules/sharing/mod-cloud-audiocom/ui/dialogs/UnsyncedProjectDialog.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/UnsyncedProjectDialog.cpp rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/UnsyncedProjectDialog.cpp diff --git a/modules/mod-cloud-audiocom/ui/dialogs/UnsyncedProjectDialog.h b/modules/sharing/mod-cloud-audiocom/ui/dialogs/UnsyncedProjectDialog.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/UnsyncedProjectDialog.h rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/UnsyncedProjectDialog.h diff --git a/modules/mod-cloud-audiocom/ui/dialogs/UploadCanceledDialog.cpp b/modules/sharing/mod-cloud-audiocom/ui/dialogs/UploadCanceledDialog.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/UploadCanceledDialog.cpp rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/UploadCanceledDialog.cpp diff --git a/modules/mod-cloud-audiocom/ui/dialogs/UploadCanceledDialog.h b/modules/sharing/mod-cloud-audiocom/ui/dialogs/UploadCanceledDialog.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/UploadCanceledDialog.h rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/UploadCanceledDialog.h diff --git a/modules/mod-cloud-audiocom/ui/dialogs/WaitForActionDialog.cpp b/modules/sharing/mod-cloud-audiocom/ui/dialogs/WaitForActionDialog.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/WaitForActionDialog.cpp rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/WaitForActionDialog.cpp diff --git a/modules/mod-cloud-audiocom/ui/dialogs/WaitForActionDialog.h b/modules/sharing/mod-cloud-audiocom/ui/dialogs/WaitForActionDialog.h similarity index 100% rename from modules/mod-cloud-audiocom/ui/dialogs/WaitForActionDialog.h rename to modules/sharing/mod-cloud-audiocom/ui/dialogs/WaitForActionDialog.h diff --git a/modules/mod-cloud-audiocom/ui/images/CloudImages.cpp b/modules/sharing/mod-cloud-audiocom/ui/images/CloudImages.cpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/images/CloudImages.cpp rename to modules/sharing/mod-cloud-audiocom/ui/images/CloudImages.cpp diff --git a/modules/mod-cloud-audiocom/ui/images/CloudImages.hpp b/modules/sharing/mod-cloud-audiocom/ui/images/CloudImages.hpp similarity index 100% rename from modules/mod-cloud-audiocom/ui/images/CloudImages.hpp rename to modules/sharing/mod-cloud-audiocom/ui/images/CloudImages.hpp diff --git a/modules/track-ui/CMakeLists.txt b/modules/track-ui/CMakeLists.txt new file mode 100644 index 000000000000..b1db0fd798cd --- /dev/null +++ b/modules/track-ui/CMakeLists.txt @@ -0,0 +1,9 @@ +# Include the modules that we'll build + +# The list of modules is ordered so that each module occurs after any others +# that it depends on +set( MODULES + mod-midi-import-export +) + +audacity_module_subdirectory("${MODULES}") diff --git a/modules/mod-midi-import-export/CMakeLists.txt b/modules/track-ui/mod-midi-import-export/CMakeLists.txt similarity index 100% rename from modules/mod-midi-import-export/CMakeLists.txt rename to modules/track-ui/mod-midi-import-export/CMakeLists.txt diff --git a/modules/mod-midi-import-export/ExportMIDI.cpp b/modules/track-ui/mod-midi-import-export/ExportMIDI.cpp similarity index 100% rename from modules/mod-midi-import-export/ExportMIDI.cpp rename to modules/track-ui/mod-midi-import-export/ExportMIDI.cpp diff --git a/modules/mod-midi-import-export/ImportMIDI.cpp b/modules/track-ui/mod-midi-import-export/ImportMIDI.cpp similarity index 100% rename from modules/mod-midi-import-export/ImportMIDI.cpp rename to modules/track-ui/mod-midi-import-export/ImportMIDI.cpp From f2ee769d413d145f4a30fef34c8cbc8ebd8a9e21 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Wed, 11 Jan 2023 07:06:08 -0500 Subject: [PATCH 2/3] Graph clusters modules and libraries used only by them --- CMakeLists.txt | 3 +- .../cmake-modules/AudacityFunctions.cmake | 48 +++++++++++++++++-- modules/CMakeLists.txt | 3 +- modules/import-export/mod-cl/CMakeLists.txt | 2 + .../import-export/mod-ffmpeg/CMakeLists.txt | 2 + modules/import-export/mod-flac/CMakeLists.txt | 7 ++- modules/import-export/mod-mp2/CMakeLists.txt | 7 ++- modules/import-export/mod-mp3/CMakeLists.txt | 2 + .../import-export/mod-mpg123/CMakeLists.txt | 7 ++- modules/import-export/mod-ogg/CMakeLists.txt | 7 ++- modules/import-export/mod-opus/CMakeLists.txt | 7 ++- modules/import-export/mod-pcm/CMakeLists.txt | 11 +++-- .../import-export/mod-wavpack/CMakeLists.txt | 7 ++- .../sharing/mod-cloud-audiocom/CMakeLists.txt | 5 ++ src/CMakeLists.txt | 6 --- 15 files changed, 103 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index df74ebe2304e..3124d80ff0f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -671,7 +671,8 @@ string( JOIN "\n" GRAPH_EDGES ${GRAPH_EDGES} ) # Choose edge attributes making it easy to hover at either end of edge # and see a tooltip describing the edge, in svg image file( WRITE "${CMAKE_CURRENT_BINARY_DIR}/modules.dot" "digraph { - graph [rankdir=LR] edge [dir=both,arrowtail=inv] \n" + graph [rankdir=LR newrank=true] edge [dir=both,arrowtail=inv] \n" + "${GRAPH_SUBGRAPHS}\n" "${GRAPH_EDGES}" "\n}\n" ) diff --git a/cmake-proxies/cmake-modules/AudacityFunctions.cmake b/cmake-proxies/cmake-modules/AudacityFunctions.cmake index 2b9ecacafe6a..f9f61823914e 100644 --- a/cmake-proxies/cmake-modules/AudacityFunctions.cmake +++ b/cmake-proxies/cmake-modules/AudacityFunctions.cmake @@ -356,7 +356,7 @@ endfunction() # shorten a target name for purposes of generating a dependency graph picture function( canonicalize_node_name var node ) # strip generator expressions - string( REGEX REPLACE ".*>.*:(.*)>" "\\1" node "${node}" ) + string( REGEX REPLACE ".*>:(.*)>" "\\1" node "${node}" ) # omit the "-interface" for alias targets to modules string( REGEX REPLACE "-interface\$" "" node "${node}" ) # shorten names of standard libraries or Apple frameworks @@ -853,10 +853,52 @@ endfunction() # The list of modules is ordered so that each module occurs after any others # that it depends on macro( audacity_module_subdirectory modules ) + # Make a graphviz cluster of module nodes and maybe some 3p libraries + set( subgraph ) + get_filename_component( name "${CMAKE_CURRENT_SOURCE_DIR}" NAME_WE ) + string( APPEND subgraph + # name must begin with "cluster" to get graphviz to draw a box + "subgraph \"cluster${name}\" { " + # style attributes and visible name + "style=bold color=blue labeljust=r labelloc=b label=\"${name}\" " + ) + + set( nodes ) + set( EXCLUDE_LIST + Audacity + PRIVATE + PUBLIC + INTERFACE + ) + + # Visit each module, and may collect some clustered node names foreach( MODULE ${MODULES} ) - add_subdirectory("${MODULE}") + set( EXTRA_CLUSTER_NODES ) # a variable that the subdirectory may change + add_subdirectory( "${MODULE}" ) + + foreach( NODE ${EXTRA_CLUSTER_NODES} ) + # This processing of NODE makes it easy for the module simply to + # designate all of its libraries as extra cluster nodes, when they + # (besides the executable itself) are not used anywhere else + if ( NODE IN_LIST EXCLUDE_LIST ) + continue() + endif() + canonicalize_node_name( NODE "${NODE}" ) + string( APPEND nodes "\"${NODE}\"\n" ) + endforeach() + endforeach() + + # complete the cluster description + foreach( MODULE ${MODULES} ) + string( APPEND nodes "\"${MODULE}\"\n" ) endforeach() + string( APPEND subgraph + # names of nodes to be grouped + "\n${nodes}" + "}\n" + ) - #propagate collected edges up to root CMakeLists.txt + # propagate collected edges and subgraphs up to root CMakeLists.txt set( GRAPH_EDGES "${GRAPH_EDGES}" PARENT_SCOPE ) + set( GRAPH_SUBGRAPHS "${GRAPH_SUBGRAPHS}${subgraph}" PARENT_SCOPE ) endmacro() diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index fd7b0c5285c1..3e55c2c0219a 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -15,5 +15,6 @@ foreach( FOLDER ${FOLDERS} ) add_subdirectory("${FOLDER}") endforeach() -#propagate collected edges up to root CMakeLists.txt +#propagate collected edges and subgraphs up to root CMakeLists.txt set( GRAPH_EDGES "${GRAPH_EDGES}" PARENT_SCOPE ) +set( GRAPH_SUBGRAPHS "${GRAPH_SUBGRAPHS}" PARENT_SCOPE ) diff --git a/modules/import-export/mod-cl/CMakeLists.txt b/modules/import-export/mod-cl/CMakeLists.txt index ccec7ecd061e..3da967fd9cde 100644 --- a/modules/import-export/mod-cl/CMakeLists.txt +++ b/modules/import-export/mod-cl/CMakeLists.txt @@ -14,4 +14,6 @@ if ( USE_LIBID3TAG ) list ( APPEND LIBRARIES PRIVATE libid3tag::libid3tag) endif() +set (EXTRA_CLUSTER_NODES "${LIBRARIES}" PARENT_SCOPE) + audacity_module( ${TARGET} "${SOURCES}" "${LIBRARIES}" "" "" ) diff --git a/modules/import-export/mod-ffmpeg/CMakeLists.txt b/modules/import-export/mod-ffmpeg/CMakeLists.txt index fedefd2aa777..0bd9acbfa7c9 100644 --- a/modules/import-export/mod-ffmpeg/CMakeLists.txt +++ b/modules/import-export/mod-ffmpeg/CMakeLists.txt @@ -21,6 +21,8 @@ set( LIBRARIES Audacity ) +set (EXTRA_CLUSTER_NODES "${LIBRARIES}" PARENT_SCOPE) + if( "${${_OPT}use_ffmpeg}" STREQUAL "linked" ) set( DISABLE_DYNAMIC_LOADING_FFMPEG YES ) endif() diff --git a/modules/import-export/mod-flac/CMakeLists.txt b/modules/import-export/mod-flac/CMakeLists.txt index 7d6d3c6cec46..72e998f4081c 100644 --- a/modules/import-export/mod-flac/CMakeLists.txt +++ b/modules/import-export/mod-flac/CMakeLists.txt @@ -8,7 +8,6 @@ set( SOURCES set( LIBRARIES PRIVATE - lib-import-export-interface FLAC::FLAC FLAC::FLAC++ ) @@ -17,4 +16,10 @@ if ( USE_LIBID3TAG ) list ( APPEND LIBRARIES PRIVATE libid3tag::libid3tag) endif() +set (EXTRA_CLUSTER_NODES "${LIBRARIES}" PARENT_SCOPE) + +list(APPEND LIBRARIES + lib-import-export-interface +) + audacity_module( ${TARGET} "${SOURCES}" "${LIBRARIES}" "" "" ) diff --git a/modules/import-export/mod-mp2/CMakeLists.txt b/modules/import-export/mod-mp2/CMakeLists.txt index 975f2531e700..ec904b88e4ae 100644 --- a/modules/import-export/mod-mp2/CMakeLists.txt +++ b/modules/import-export/mod-mp2/CMakeLists.txt @@ -7,7 +7,6 @@ set( SOURCES set( LIBRARIES PRIVATE - lib-import-export-interface twolame ) @@ -15,4 +14,10 @@ if ( USE_LIBID3TAG ) list ( APPEND LIBRARIES PRIVATE libid3tag::libid3tag) endif() +set (EXTRA_CLUSTER_NODES "${LIBRARIES}" PARENT_SCOPE) + +list (APPEND LIBRARIES + lib-import-export-interface +) + audacity_module( ${TARGET} "${SOURCES}" "${LIBRARIES}" "" "" ) diff --git a/modules/import-export/mod-mp3/CMakeLists.txt b/modules/import-export/mod-mp3/CMakeLists.txt index 2b07d818411b..de2d789ab045 100644 --- a/modules/import-export/mod-mp3/CMakeLists.txt +++ b/modules/import-export/mod-mp3/CMakeLists.txt @@ -17,4 +17,6 @@ if ( USE_LIBID3TAG ) list ( APPEND LIBRARIES PRIVATE libid3tag::libid3tag) endif() +set (EXTRA_CLUSTER_NODES "${LIBRARIES}" PARENT_SCOPE) + audacity_module( ${TARGET} "${SOURCES}" "${LIBRARIES}" "" "" ) diff --git a/modules/import-export/mod-mpg123/CMakeLists.txt b/modules/import-export/mod-mpg123/CMakeLists.txt index 638e9875aa2c..9d10788c34de 100644 --- a/modules/import-export/mod-mpg123/CMakeLists.txt +++ b/modules/import-export/mod-mpg123/CMakeLists.txt @@ -7,7 +7,6 @@ set( SOURCES set( LIBRARIES PRIVATE - lib-import-export-interface mpg123::libmpg123 ) @@ -15,4 +14,10 @@ if ( USE_LIBID3TAG ) list ( APPEND LIBRARIES PRIVATE libid3tag::libid3tag) endif() +set (EXTRA_CLUSTER_NODES "${LIBRARIES}" PARENT_SCOPE) + +list(APPEND LIBRARIES + lib-import-export-interface +) + audacity_module( ${TARGET} "${SOURCES}" "${LIBRARIES}" "" "" ) diff --git a/modules/import-export/mod-ogg/CMakeLists.txt b/modules/import-export/mod-ogg/CMakeLists.txt index 7f537f75b56f..f264a587ef52 100644 --- a/modules/import-export/mod-ogg/CMakeLists.txt +++ b/modules/import-export/mod-ogg/CMakeLists.txt @@ -8,11 +8,16 @@ set( SOURCES set( LIBRARIES PRIVATE - lib-import-export-interface Ogg::ogg Vorbis::vorbis Vorbis::vorbisfile Vorbis::vorbisenc ) +set (EXTRA_CLUSTER_NODES "${LIBRARIES}" PARENT_SCOPE) + +list(APPEND LIBRARIES + lib-import-export-interface +) + audacity_module( ${TARGET} "${SOURCES}" "${LIBRARIES}" "" "" ) diff --git a/modules/import-export/mod-opus/CMakeLists.txt b/modules/import-export/mod-opus/CMakeLists.txt index 01b4f1b04480..66b3c4732ada 100644 --- a/modules/import-export/mod-opus/CMakeLists.txt +++ b/modules/import-export/mod-opus/CMakeLists.txt @@ -8,10 +8,15 @@ set( SOURCES set( LIBRARIES PRIVATE - lib-import-export-interface Opus::opus opusfile::opusfile Ogg::ogg ) +set (EXTRA_CLUSTER_NODES "${LIBRARIES}" PARENT_SCOPE) + +list(APPEND LIBRARIES + lib-import-export-interface +) + audacity_module( ${TARGET} "${SOURCES}" "${LIBRARIES}" "" "" ) diff --git a/modules/import-export/mod-pcm/CMakeLists.txt b/modules/import-export/mod-pcm/CMakeLists.txt index cca5915f104b..35718b4effec 100644 --- a/modules/import-export/mod-pcm/CMakeLists.txt +++ b/modules/import-export/mod-pcm/CMakeLists.txt @@ -6,14 +6,17 @@ set( SOURCES PCM.cpp ) -set( LIBRARIES +if ( USE_LIBID3TAG ) + list ( APPEND LIBRARIES PRIVATE libid3tag::libid3tag) +endif() + +set (EXTRA_CLUSTER_NODES "${LIBRARIES}" PARENT_SCOPE) + +list (APPEND LIBRARIES PRIVATE lib-import-export-interface lib-file-formats-interface ) -if ( USE_LIBID3TAG ) - list ( APPEND LIBRARIES PRIVATE libid3tag::libid3tag) -endif() audacity_module( ${TARGET} "${SOURCES}" "${LIBRARIES}" "" "" ) diff --git a/modules/import-export/mod-wavpack/CMakeLists.txt b/modules/import-export/mod-wavpack/CMakeLists.txt index 0c33ea761041..40e360662f3d 100644 --- a/modules/import-export/mod-wavpack/CMakeLists.txt +++ b/modules/import-export/mod-wavpack/CMakeLists.txt @@ -8,8 +8,13 @@ set( SOURCES set( LIBRARIES PRIVATE - lib-import-export-interface wavpack::wavpack ) +set (EXTRA_CLUSTER_NODES "${LIBRARIES}" PARENT_SCOPE) + +list(APPEND LIBRARIES + lib-import-export-interface +) + audacity_module( ${TARGET} "${SOURCES}" "${LIBRARIES}" "" "" ) diff --git a/modules/sharing/mod-cloud-audiocom/CMakeLists.txt b/modules/sharing/mod-cloud-audiocom/CMakeLists.txt index f63fe556746a..e108626fd0a3 100644 --- a/modules/sharing/mod-cloud-audiocom/CMakeLists.txt +++ b/modules/sharing/mod-cloud-audiocom/CMakeLists.txt @@ -79,6 +79,11 @@ endif() set( LIBRARIES PRIVATE lib-cloud-audiocom-interface +) + +set (EXTRA_CLUSTER_NODES "${LIBRARIES};lib-crypto" PARENT_SCOPE) + +list(APPEND LIBRARIES lib-menus-interface lib-shuttlegui-interface lib-wx-wrappers-interface diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 500e7692394e..19ed20f2d455 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1356,12 +1356,6 @@ if( ${_OPT}has_url_schemes_support ) ) endif() -if( ${_OPT}has_audiocom_upload ) - list( APPEND AUDACITY_LIBRARIES - lib-cloud-audiocom-interface - ) -endif() - if( ${_OPT}has_crashreports ) if( ${_OPT}crashreport_backend STREQUAL "crashpad" ) list(APPEND DEFINES From 780559932f46376b6af3799c43ab1179a2f63f54 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Fri, 29 Mar 2024 15:27:33 -0400 Subject: [PATCH 3/3] Old modules depend privately on Audacity --- modules/etc/mod-null/CMakeLists.txt | 6 +++++- modules/nyquist/mod-nyq-bench/CMakeLists.txt | 6 +++++- modules/scripting/mod-script-pipe/CMakeLists.txt | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/modules/etc/mod-null/CMakeLists.txt b/modules/etc/mod-null/CMakeLists.txt index 4798e6ac1c53..d00e23288ac9 100644 --- a/modules/etc/mod-null/CMakeLists.txt +++ b/modules/etc/mod-null/CMakeLists.txt @@ -12,7 +12,11 @@ set( SOURCES ModNullCallback.cpp ModNullCallback.h ) -audacity_module( ${TARGET} "${SOURCES}" "Audacity" +set ( LIBRARIES + PRIVATE + Audacity +) +audacity_module( ${TARGET} "${SOURCES}" "${LIBRARIES}" "${DEFINES}" "" ) set_target_properties( ${TARGET} PROPERTIES EXCLUDE_FROM_ALL YES ) diff --git a/modules/nyquist/mod-nyq-bench/CMakeLists.txt b/modules/nyquist/mod-nyq-bench/CMakeLists.txt index dc02c6cf3285..7e328c62f147 100644 --- a/modules/nyquist/mod-nyq-bench/CMakeLists.txt +++ b/modules/nyquist/mod-nyq-bench/CMakeLists.txt @@ -12,7 +12,11 @@ set( DEFINES # versions of wxWidgets...even if the build is for Release. wxDEBUG_LEVEL=0 ) -audacity_module( ${TARGET} "${SOURCES}" "Audacity" +set( LIBRARIES + PRIVATE + Audacity +) +audacity_module( ${TARGET} "${SOURCES}" "${LIBRARIES}" "${DEFINES}" "" ) set_target_properties( ${TARGET} PROPERTIES EXCLUDE_FROM_ALL YES ) diff --git a/modules/scripting/mod-script-pipe/CMakeLists.txt b/modules/scripting/mod-script-pipe/CMakeLists.txt index 5ee18627febd..9bb867f02633 100644 --- a/modules/scripting/mod-script-pipe/CMakeLists.txt +++ b/modules/scripting/mod-script-pipe/CMakeLists.txt @@ -13,5 +13,9 @@ set( DEFINES # debug versions of wxWidgets...even if the build is for Release. wxDEBUG_LEVEL=0 ) -audacity_module( mod-script-pipe "${SOURCES}" "Audacity" +set( LIBRARIES + PRIVATE + Audacity +) +audacity_module( mod-script-pipe "${SOURCES}" "${LIBRARIES}" "${DEFINES}" "" )