Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-15 17:11:20 +01:00
Code Issues Releases Wiki Activity

Resample into lib-math; Audacity doesn't use libsoxr directly

Browse Source
This commit is contained in:
Paul Licameli
2021-02-28 11:13:44 -05:00
parent f52dfd3ac3
commit cfce6da603
7 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmake-proxies/CMakeLists.txt
View File

@@ -160,7 +160,6 @@ set_conan_vars_to_parent()
# #
# directory option symbol req chk version # directory option symbol req chk version
addlib( libsndfile sndfile SNDFILE YES YES "sndfile >= 1.0.28" ) addlib( libsndfile sndfile SNDFILE YES YES "sndfile >= 1.0.28" )
addlib( libsoxr soxr SOXR YES YES "soxr >= 0.1.1" )
addlib( portaudio-v19 portaudio PORTAUDIO YES YES "" ) addlib( portaudio-v19 portaudio PORTAUDIO YES YES "" )
addlib( sqlite sqlite SQLITE YES YES "sqlite3 >= 3.32.0" ) addlib( sqlite sqlite SQLITE YES YES "sqlite3 >= 3.32.0" )

5
libraries/lib-math/CMakeLists.txt
View File

@@ -2,6 +2,8 @@
A library of mathematical utilities and manipulation of samples A library of mathematical utilities and manipulation of samples
]]# ]]#
addlib( libsoxr soxr SOXR YES YES "soxr >= 0.1.1" )
set( SOURCES set( SOURCES
Dither.cpp Dither.cpp
Dither.h Dither.h
@@ -13,6 +15,8 @@ set( SOURCES
Matrix.h Matrix.h
RealFFTf.cpp RealFFTf.cpp
RealFFTf.h RealFFTf.h
Resample.cpp
Resample.h
SampleCount.cpp SampleCount.cpp
SampleCount.h SampleCount.h
SampleFormat.cpp SampleFormat.cpp
@@ -22,6 +26,7 @@ set( SOURCES
float_cast.h float_cast.h
) )
set( LIBRARIES set( LIBRARIES
libsoxr
lib-preferences-interface lib-preferences-interface
PRIVATE PRIVATE
wxBase wxBase

0
src/Resample.cpp → libraries/lib-math/Resample.cpp
View File

4
src/Resample.h → libraries/lib-math/Resample.h
View File

@@ -12,8 +12,6 @@
#ifndef __AUDACITY_RESAMPLE_H__ #ifndef __AUDACITY_RESAMPLE_H__
#define __AUDACITY_RESAMPLE_H__ #define __AUDACITY_RESAMPLE_H__
#include "SampleFormat.h" #include "SampleFormat.h"
template< typename Enum > class EnumSetting; template< typename Enum > class EnumSetting;
@@ -25,7 +23,7 @@ struct soxr_deleter {
}; };
using soxrHandle = std::unique_ptr<soxr, soxr_deleter>; using soxrHandle = std::unique_ptr<soxr, soxr_deleter>;
class AUDACITY_DLL_API Resample final class MATH_API Resample final
{ {
public: public:
/// Resamplers may have more than one method, offering a /// Resamplers may have more than one method, offering a

3
src/CMakeLists.txt
View File

@@ -228,8 +228,6 @@ list( APPEND SOURCES
Registrar.h Registrar.h
Registry.cpp Registry.cpp
Registry.h Registry.h
Resample.cpp
Resample.h
RingBuffer.cpp RingBuffer.cpp
RingBuffer.h RingBuffer.h
SampleBlock.cpp SampleBlock.cpp
@@ -1074,7 +1072,6 @@ list( APPEND LIBRARIES
expat::expat expat::expat
libmp3lame::libmp3lame libmp3lame::libmp3lame
libsndfile libsndfile
libsoxr
portaudio-v19 portaudio-v19
sqlite sqlite
$<$<BOOL:${${_OPT}has_crashreports}>:crashreports> $<$<BOOL:${${_OPT}has_crashreports}>:crashreports>

2
src/effects/ChangeSpeed.cpp
View File

@@ -25,7 +25,7 @@
#include "../LabelTrack.h" #include "../LabelTrack.h"
#include "Prefs.h" #include "Prefs.h"
#include "../Resample.h" #include "Resample.h"
#include "../Shuttle.h" #include "../Shuttle.h"
#include "../ShuttleGui.h" #include "../ShuttleGui.h"
#include "../widgets/NumericTextCtrl.h" #include "../widgets/NumericTextCtrl.h"

2
src/prefs/QualityPrefs.cpp
View File

@@ -26,7 +26,7 @@
#include "../AudioIOBase.h" #include "../AudioIOBase.h"
#include "Dither.h" #include "Dither.h"
#include "Prefs.h" #include "Prefs.h"
#include "../Resample.h" #include "Resample.h"
#include "../ShuttleGui.h" #include "../ShuttleGui.h"
#define ID_SAMPLE_RATE_CHOICE 7001 #define ID_SAMPLE_RATE_CHOICE 7001