helpers: fix default now playing song format and validation of user-specified one

This commit is contained in:
Andrzej Rybczak
2010-08-24 16:12:58 +02:00
parent f310dbfd70
commit 7d3a817de0

View File

@@ -43,7 +43,7 @@ bool ConnectToMPD()
void ParseArgv(int argc, char **argv) void ParseArgv(int argc, char **argv)
{ {
bool quit = 0; bool quit = 0;
std::string now_playing_format = "{{(%l) }{{%a - }%t}}|{%f}}"; std::string now_playing_format = "{{{(%l) }{{%a - }%t}}|{%f}}";
for (int i = 1; i < argc; ++i) for (int i = 1; i < argc; ++i)
{ {
@@ -147,7 +147,7 @@ void ParseArgv(int argc, char **argv)
{ {
if (argc > ++i) if (argc > ++i)
{ {
if (MPD::Song::isFormatOk("now-playing format", now_playing_format)) if (MPD::Song::isFormatOk("now-playing format", argv[i]))
{ {
// apply additional pair of braces // apply additional pair of braces
now_playing_format = "{"; now_playing_format = "{";