summaryrefslogtreecommitdiffstats
path: root/src/VLCInput.cpp
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-07-08 09:57:33 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-07-08 09:57:33 +0200
commit561b6adce76dd209ebc547fcd98f525501742d97 (patch)
tree17f36fb2f9170b2108851e613b8b3f7100736410 /src/VLCInput.cpp
parent5774d9b236567767cc473a790290d41ac65e6600 (diff)
downloadODR-AudioEnc-561b6adce76dd209ebc547fcd98f525501742d97.tar.gz
ODR-AudioEnc-561b6adce76dd209ebc547fcd98f525501742d97.tar.bz2
ODR-AudioEnc-561b6adce76dd209ebc547fcd98f525501742d97.zip
Protect m_nowplaying with mutex
Diffstat (limited to 'src/VLCInput.cpp')
-rw-r--r--src/VLCInput.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/VLCInput.cpp b/src/VLCInput.cpp
index 37ad1e0..33c4594 100644
--- a/src/VLCInput.cpp
+++ b/src/VLCInput.cpp
@@ -320,14 +320,22 @@ ssize_t VLCInput::m_read(uint8_t* buf, size_t length)
char* nowplaying_sz = libvlc_media_get_meta(media, libvlc_meta_NowPlaying);
if (nowplaying_sz) {
+ std::lock_guard<std::mutex> lock(m_nowplaying_mutex);
m_nowplaying = nowplaying_sz;
+
free(nowplaying_sz);
}
}
return err;
}
-bool write_icy_to_file(const std::string& text, const std::string& filename, bool dl_plus)
+/* Write the corresponding text to a file readable by mot-encoder, 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.
+ *
+ * Returns false on failure
+ */
+bool write_icy_to_file(const std::string text, const std::string& filename, bool dl_plus)
{
FILE* fd = fopen(filename.c_str(), "wb");
if (fd) {
@@ -368,6 +376,8 @@ void VLCInput::write_icy_text(const std::string& filename, bool dl_plus)
}
else {
+ std::lock_guard<std::mutex> lock(m_nowplaying_mutex);
+
if (m_nowplaying_previous != m_nowplaying) {
icy_text_written = std::async(std::launch::async,
std::bind(write_icy_to_file, m_nowplaying, filename, dl_plus));