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

add song_status_format_no_colors to display it in a message

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-08-24 18:54:11 +02:00
parent 8d7a9d39cd
commit c961ab411c
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/playlist.cpp
View File

@@ -510,7 +510,7 @@ bool Playlist::Add(const MPD::Song &s, bool in_playlist, bool play)
int id = Mpd.AddSong(s); int id = Mpd.AddSong(s);
if (id >= 0) if (id >= 0)
{ {
ShowMessage("Added to playlist: %s", s.toString(Config.song_status_format).c_str()); ShowMessage("Added to playlist: %s", s.toString(Config.song_status_format_no_colors).c_str());
if (play) if (play)
Mpd.PlayID(id); Mpd.PlayID(id);
return true; return true;

10
src/settings.cpp
View File

@@ -244,6 +244,7 @@ void DefaultConfiguration(ncmpcpp_config &conf)
conf.song_list_columns_format = "(7f)[green]{l} (25)[cyan]{a} (40)[]{t} (30)[red]{b}"; conf.song_list_columns_format = "(7f)[green]{l} (25)[cyan]{a} (40)[]{t} (30)[red]{b}";
conf.song_list_format = "{{%a - }{%t}|{$8%f$9}$R{$3(%l)$9}}"; conf.song_list_format = "{{%a - }{%t}|{$8%f$9}$R{$3(%l)$9}}";
conf.song_status_format = "{{{%a{ \"%b\"{ (%y)}} - }{%t}}|{%f}}"; conf.song_status_format = "{{{%a{ \"%b\"{ (%y)}} - }{%t}}|{%f}}";
conf.song_status_format_no_colors = conf.song_status_format;
conf.song_window_title_format = "{{%a - }{%t}|{%f}}"; conf.song_window_title_format = "{{%a - }{%t}|{%f}}";
conf.song_library_format = "{{%n - }{%t}|{%f}}"; conf.song_library_format = "{{%n - }{%t}|{%f}}";
conf.tag_editor_album_format = "{{(%y) }%b}"; conf.tag_editor_album_format = "{{(%y) }%b}";
@@ -544,6 +545,15 @@ void ReadConfiguration(ncmpcpp_config &conf)
conf.song_status_format = '{'; conf.song_status_format = '{';
conf.song_status_format += v; conf.song_status_format += v;
conf.song_status_format += '}'; conf.song_status_format += '}';
// make version without colors
if (conf.song_status_format.find("$") != std::string::npos)
{
Buffer status_no_colors;
String2Buffer(conf.song_status_format, status_no_colors);
conf.song_status_format_no_colors = status_no_colors.Str();
}
else
conf.song_status_format_no_colors = conf.song_status_format;
} }
} }
else if (cl.find("song_library_format") != std::string::npos) else if (cl.find("song_library_format") != std::string::npos)

1
src/settings.h
View File

@@ -127,6 +127,7 @@ struct ncmpcpp_config
std::string song_list_columns_format; std::string song_list_columns_format;
std::string song_list_format; std::string song_list_format;
std::string song_status_format; std::string song_status_format;
std::string song_status_format_no_colors;
std::string song_window_title_format; std::string song_window_title_format;
std::string song_library_format; std::string song_library_format;
std::string tag_editor_album_format; std::string tag_editor_album_format;