From c2225172fbbf392d22ed529c9d19c847bac69aa0 Mon Sep 17 00:00:00 2001 From: unK Date: Thu, 4 Sep 2008 01:03:29 +0200 Subject: [PATCH] use mkdir() instead of system() + a few clean-ups --- doc/ncmpcpprc | 2 +- src/lyrics.cpp | 4 ++-- src/menu.h | 4 ++-- src/ncmpcpp.cpp | 16 ++++++++-------- src/status_checker.cpp | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/ncmpcpprc b/doc/ncmpcpprc index 266619a7..56a3fd3e 100644 --- a/doc/ncmpcpprc +++ b/doc/ncmpcpprc @@ -85,7 +85,7 @@ ## - color is optional (if it's not present, default window color will be used) ## # -#song_columns_list_format = "(8)[green]{l} (28)[cyan]{a} (28)[yellow]{b} (50)[red]{t}" +#song_columns_list_format = "(8)[green]{l} (28)[cyan]{a} (28){b} (50)[red]{t}" # ##### various settings ##### # diff --git a/src/lyrics.cpp b/src/lyrics.cpp index 18a0a76f..40f2c1db 100644 --- a/src/lyrics.cpp +++ b/src/lyrics.cpp @@ -19,9 +19,9 @@ ***************************************************************************/ #include "lyrics.h" +#include const string lyrics_folder = home_folder + "/" + ".lyrics"; -const string mkdir_command = "mkdir " + lyrics_folder + " &>/dev/null"; size_t write_data(char *buffer, size_t size, size_t nmemb, string data) { @@ -38,7 +38,7 @@ string GetLyrics(string artist, string song) { const string filename = artist + " - " + song + ".txt"; const string fullpath = lyrics_folder + "/" + filename; - system(mkdir_command.c_str()); + mkdir(lyrics_folder.c_str(), 0755); string result; std::ifstream input(fullpath.c_str()); diff --git a/src/menu.h b/src/menu.h index e6392d9e..c7e1e7d1 100644 --- a/src/menu.h +++ b/src/menu.h @@ -309,7 +309,7 @@ string Menu::GetCurrentOption() const { try { - return OmitBBCodes(DisplayOption(itsOptions.at(itsHighlight)->item)); + return DisplayOption(itsOptions.at(itsHighlight)->item); } catch (std::out_of_range) { @@ -322,7 +322,7 @@ string Menu::GetOption(int i) const { try { - return OmitBBCodes(DisplayOption(itsOptions.at(i-1)->item)); + return DisplayOption(itsOptions.at(i-1)->item); } catch (std::out_of_range) { diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp index c4497cb0..7d5619e6 100644 --- a/src/ncmpcpp.cpp +++ b/src/ncmpcpp.cpp @@ -814,7 +814,7 @@ int main(int argc, char *argv[]) if (id >= 0) { Mpd->PlayID(id); - ShowMessage("Added to playlist: " + OmitBBCodes(DisplaySong(s))); + ShowMessage("Added to playlist: " + DisplaySong(s, &Config.song_status_format)); } mBrowser->Refresh(); break; @@ -1125,7 +1125,7 @@ int main(int argc, char *argv[]) if (id >= 0) { Mpd->PlayID(id); - ShowMessage("Added to playlist: " + OmitBBCodes(DisplaySong(s))); + ShowMessage("Added to playlist: " + DisplaySong(s, &Config.song_status_format)); } break; } @@ -1185,7 +1185,7 @@ int main(int argc, char *argv[]) int id = Mpd->AddSong(s); if (id >= 0) { - ShowMessage("Added to playlist: " + OmitBBCodes(DisplaySong(s))); + ShowMessage("Added to playlist: " + DisplaySong(s, &Config.song_status_format)); if (Keypressed(input, Key.Enter)) Mpd->PlayID(id); } @@ -1229,7 +1229,7 @@ int main(int argc, char *argv[]) int id = Mpd->AddSong(s); if (id >= 0) { - ShowMessage("Added to playlist: " + OmitBBCodes(DisplaySong(s))); + ShowMessage("Added to playlist: " + DisplaySong(s, &Config.song_status_format)); if (Keypressed(input, Key.Enter)) Mpd->PlayID(id); } @@ -1286,7 +1286,7 @@ int main(int argc, char *argv[]) { Song &s = *item.song; if (Mpd->AddSong(s) != -1) - ShowMessage("Added to playlist: " + OmitBBCodes(DisplaySong(s))); + ShowMessage("Added to playlist: " + DisplaySong(s, &Config.song_status_format)); break; } case itPlaylist: @@ -1316,7 +1316,7 @@ int main(int argc, char *argv[]) Song &s = *vSearched[id]; if (Mpd->AddSong(s) != -1) - ShowMessage("Added to playlist: " + OmitBBCodes(DisplaySong(s))); + ShowMessage("Added to playlist: " + DisplaySong(s, &Config.song_status_format)); mSearcher->Go(wDown); } else if (current_screen == csLibrary) @@ -1833,7 +1833,7 @@ int main(int argc, char *argv[]) if (s->GetDirectory() == EMPTY_TAG) // for streams continue; - string option = OmitBBCodes(DisplaySong(*s)); + string option = DisplaySong(*s); GetDirectory(s->GetDirectory()); for (int i = 1; i <= mBrowser->Size(); i++) { @@ -2127,7 +2127,7 @@ int main(int argc, char *argv[]) for (int i = (wCurrent == mBrowser ? search_engine_static_option : 1); i <= mCurrent->Size(); i++) { - string name = mCurrent->GetOption(i); + string name = OmitBBCodes(mCurrent->GetOption(i)); transform(name.begin(), name.end(), name.begin(), tolower); if (name.find(findme) != string::npos && !mCurrent->IsStatic(i)) { diff --git a/src/status_checker.cpp b/src/status_checker.cpp index ab6fb6bc..63ca261b 100644 --- a/src/status_checker.cpp +++ b/src/status_checker.cpp @@ -312,7 +312,7 @@ void NcmpcppStatusChanged(MPDConnection *Mpd, MPDStatusChanges changed, void *da tracklength = " [" + ShowTime(elapsed) + "/" + s.GetLength() + "]"; else tracklength = " [" + ShowTime(elapsed) + "]"; - ncmpcpp_string_t playing_song = TO_WSTRING(OmitBBCodes(DisplaySong(s, &Config.song_status_format))); + ncmpcpp_string_t playing_song = TO_WSTRING(DisplaySong(s, &Config.song_status_format)); int max_length_without_scroll = wFooter->GetWidth()-player_state.length()-tracklength.length(); @@ -334,7 +334,7 @@ void NcmpcppStatusChanged(MPDConnection *Mpd, MPDStatusChanges changed, void *da playing_song_scroll_begin = 0; } else - wFooter->WriteXY(player_state.length(), 1, OmitBBCodes(DisplaySong(s, &Config.song_status_format)), 1); + wFooter->WriteXY(player_state.length(), 1, DisplaySong(s, &Config.song_status_format), 1); wFooter->Bold(1); wFooter->WriteXY(wFooter->GetWidth()-tracklength.length(), 1, tracklength);