Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

song info: do not use TagLib if mpd_music_dir is unset

Browse Source 
Trying to do use TagLib with mpd_music_dir unset resulted in a segfault
in TagLib when trying to open the file - its path was just the filename.
This commit is contained in:
Wieland Hoffmann
2012-10-16 09:15:25 +02:00
committed by Andrzej Rybczak
parent 759322d00c
commit 1e1aba121d
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/song_info.cpp
View File

@@ -93,25 +93,25 @@ void SongInfo::switchTo()
void SongInfo::PrepareSong(MPD::Song &s) void SongInfo::PrepareSong(MPD::Song &s)
{ {
# ifdef HAVE_TAGLIB_H
std::string path_to_file;
if (s.isFromDatabase())
path_to_file += Config.mpd_music_dir;
path_to_file += s.getURI();
TagLib::FileRef f(path_to_file.c_str());
# endif // HAVE_TAGLIB_H
w << NC::Format::Bold << Config.color1 << "Filename: " << NC::Format::NoBold << Config.color2 << s.getName() << '\n' << NC::Color::End; w << NC::Format::Bold << Config.color1 << "Filename: " << NC::Format::NoBold << Config.color2 << s.getName() << '\n' << NC::Color::End;
w << NC::Format::Bold << "Directory: " << NC::Format::NoBold << Config.color2; w << NC::Format::Bold << "Directory: " << NC::Format::NoBold << Config.color2;
ShowTag(w, s.getDirectory()); ShowTag(w, s.getDirectory());
w << "\n\n" << NC::Color::End; w << "\n\n" << NC::Color::End;
w << NC::Format::Bold << "Length: " << NC::Format::NoBold << Config.color2 << s.getLength() << '\n' << NC::Color::End; w << NC::Format::Bold << "Length: " << NC::Format::NoBold << Config.color2 << s.getLength() << '\n' << NC::Color::End;
# ifdef HAVE_TAGLIB_H # ifdef HAVE_TAGLIB_H
if (!f.isNull()) if (!Config.mpd_music_dir.empty())
{ {
w << NC::Format::Bold << "Bitrate: " << NC::Format::NoBold << Config.color2 << f.audioProperties()->bitrate() << " kbps\n" << NC::Color::End; std::string path_to_file;
w << NC::Format::Bold << "Sample rate: " << NC::Format::NoBold << Config.color2 << f.audioProperties()->sampleRate() << " Hz\n" << NC::Color::End; if (s.isFromDatabase())
w << NC::Format::Bold << "Channels: " << NC::Format::NoBold << Config.color2 << (f.audioProperties()->channels() == 1 ? "Mono" : "Stereo") << '\n' << NC::Color::Default; path_to_file += Config.mpd_music_dir;
path_to_file += s.getURI();
TagLib::FileRef f(path_to_file.c_str());
if (!f.isNull())
{
w << NC::Format::Bold << "Bitrate: " << NC::Format::NoBold << Config.color2 << f.audioProperties()->bitrate() << " kbps\n" << NC::Color::End;
w << NC::Format::Bold << "Sample rate: " << NC::Format::NoBold << Config.color2 << f.audioProperties()->sampleRate() << " Hz\n" << NC::Color::End;
w << NC::Format::Bold << "Channels: " << NC::Format::NoBold << Config.color2 << (f.audioProperties()->channels() == 1 ? "Mono" : "Stereo") << '\n' << NC::Color::Default;
}
} }
# endif // HAVE_TAGLIB_H # endif // HAVE_TAGLIB_H
w << NC::Color::Default; w << NC::Color::Default;