diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-11-06 21:05:23 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-11-06 21:13:39 +0100 |
commit | 6bc737cb1dd5170b6d893d98e9c37bd2701954c2 (patch) | |
tree | f9abab8b072220281784bca68f3c9f7100a67ac3 /rbutil/rbutilqt/base | |
parent | 07604d62ab375e5c4f42bd05704ace608600c478 (diff) | |
download | rockbox-6bc737cb1dd5170b6d893d98e9c37bd2701954c2.tar.gz rockbox-6bc737cb1dd5170b6d893d98e9c37bd2701954c2.zip |
rbutil: Enable use of libmp3lame on macOS.
Since we're now automatically falling back to using the command line
lame if we cannot load the library we can enable it on macOS as well.
Change-Id: I0df1bb4a011d019a340fe54f1db6fc4645f9081b
Diffstat (limited to 'rbutil/rbutilqt/base')
-rw-r--r-- | rbutil/rbutilqt/base/encoderbase.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/rbutil/rbutilqt/base/encoderbase.cpp b/rbutil/rbutilqt/base/encoderbase.cpp index 90d7292b3a..fe45eee49b 100644 --- a/rbutil/rbutilqt/base/encoderbase.cpp +++ b/rbutil/rbutilqt/base/encoderbase.cpp | |||
@@ -58,10 +58,6 @@ EncoderBase* EncoderBase::getEncoder(QObject* parent,QString encoder) | |||
58 | EncoderBase* enc; | 58 | EncoderBase* enc; |
59 | if(encoder == "lame") | 59 | if(encoder == "lame") |
60 | { | 60 | { |
61 | #if defined(Q_OS_MACX) | ||
62 | /* currently not on OS X */ | ||
63 | enc = new EncoderExe(encoder, parent); | ||
64 | #else | ||
65 | enc = new EncoderLame(parent); | 61 | enc = new EncoderLame(parent); |
66 | if (!enc->configOk()) | 62 | if (!enc->configOk()) |
67 | { | 63 | { |
@@ -71,7 +67,6 @@ EncoderBase* EncoderBase::getEncoder(QObject* parent,QString encoder) | |||
71 | enc = new EncoderExe(encoder, parent); | 67 | enc = new EncoderExe(encoder, parent); |
72 | 68 | ||
73 | } | 69 | } |
74 | #endif | ||
75 | return enc; | 70 | return enc; |
76 | } | 71 | } |
77 | else // rbspeex is default | 72 | else // rbspeex is default |