summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2017-07-24 10:50:02 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2017-07-24 10:51:40 +0200
commit956c3e5923ac3c0b149b31aad84c339923f6bc31 (patch)
tree981b13cba37fcaa1423e490b74ff45871a6d01f9
parent7103e8b88ef48d29761cd18ed681a034281a5de5 (diff)
downloadODR-AudioEnc-956c3e5923ac3c0b149b31aad84c339923f6bc31.tar.gz
ODR-AudioEnc-956c3e5923ac3c0b149b31aad84c339923f6bc31.tar.bz2
ODR-AudioEnc-956c3e5923ac3c0b149b31aad84c339923f6bc31.zip
Replace mot-encoder by ODR-PadEnc
-rw-r--r--libtoolame-dab/toolame.c2
-rw-r--r--src/VLCInput.cpp2
-rw-r--r--src/VLCInput.h2
-rw-r--r--src/odr-audioenc.cpp6
4 files changed, 4 insertions, 8 deletions
diff --git a/libtoolame-dab/toolame.c b/libtoolame-dab/toolame.c
index b15e555..b8a7afb 100644
--- a/libtoolame-dab/toolame.c
+++ b/libtoolame-dab/toolame.c
@@ -551,7 +551,7 @@ int toolame_encode_frame(
}
if (xpad_len) {
- /* The F-PAD is also given us by mot-encoder */
+ /* The F-PAD is also given us by ODR-PadEnc */
putbits (&bs, xpad_data[header.dab_length - 2], 8);
putbits (&bs, xpad_data[header.dab_length - 1], 8);
}
diff --git a/src/VLCInput.cpp b/src/VLCInput.cpp
index bac5508..c0c9433 100644
--- a/src/VLCInput.cpp
+++ b/src/VLCInput.cpp
@@ -375,7 +375,7 @@ ssize_t VLCInput::m_read(uint8_t* buf, size_t length)
const std::string VLCInput::ICY_TEXT_SEPARATOR = " - ";
-/*! Write the corresponding text to a file readable by mot-encoder, with optional
+/*! Write the corresponding text to a file readable by ODR-PadEnc, with optional
* DL+ information. The text is passed as a copy because we actually use the
* m_nowplaying variable which is also accessed in another thread, so better
* make a copy.
diff --git a/src/VLCInput.h b/src/VLCInput.h
index 16c6cbf..63975e7 100644
--- a/src/VLCInput.h
+++ b/src/VLCInput.h
@@ -187,7 +187,7 @@ class VLCInput
std::string m_gain;
/*! VLC can give us the ICY-Text from an Icecast stream,
- * which we optionnally write into a text file for mot-encoder
+ * which we optionally write into a text file for ODR-PadEnc
*/
std::future<bool> icy_text_written;
std::mutex m_nowplaying_mutex;
diff --git a/src/odr-audioenc.cpp b/src/odr-audioenc.cpp
index 8fff655..7769481 100644
--- a/src/odr-audioenc.cpp
+++ b/src/odr-audioenc.cpp
@@ -43,10 +43,6 @@
* - \ref DataInput
* - \ref SilenceDetection
*
- * For the mot-encoder:
- * - \ref mot-encoder.cpp
- *
- *
* \file odr-audioenc.cpp
* \brief The main file for the audio encoder
*/
@@ -158,7 +154,7 @@ void usage(const char* name)
" multiple times)\n"
" -L OPTION Give an additional options to VLC (can be given\n"
" multiple times)\n"
- " -w, --write-icy-text=filename Write the ICY Text into the file, so that mot-encoder can read it.\n"
+ " -w, --write-icy-text=filename Write the ICY Text into the file, so that ODR-PadEnc can read it.\n"
" -W, --write-icy-text-dl-plus When writing the ICY Text into the file, add DL Plus information.\n"
#else
" The VLC input was disabled at compile-time\n"