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

fix a few glitches in ParseArgv()

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-08-24 02:25:20 +02:00
parent 08c1cee724
commit 8c60ff1493
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/helpers.cpp
View File

@@ -85,8 +85,8 @@ void ParseArgv(int argc, char **argv)
<< " -h, --host connect to server at host [localhost]\n" << " -h, --host connect to server at host [localhost]\n"
<< " -p, --port connect to server at port [6600]\n" << " -p, --port connect to server at port [6600]\n"
<< " -?, --help show this help message\n" << " -?, --help show this help message\n"
<< " -v, --version display version information\n\n" << " -v, --version display version information\n"
<< " --now-playing display now playing song [" << now_playing_format << "\n" << " --now-playing display now playing song [" << now_playing_format << "]\n"
<< "\n" << "\n"
<< " play start playing\n" << " play start playing\n"
<< " pause pause the currently playing song\n" << " pause pause the currently playing song\n"
@@ -105,6 +105,11 @@ void ParseArgv(int argc, char **argv)
if (!strcmp(argv[i], "--now-playing")) if (!strcmp(argv[i], "--now-playing"))
{ {
Mpd.UpdateStatus(); Mpd.UpdateStatus();
if (!Mpd.GetErrorMessage().empty())
{
std::cout << "Error: " << Mpd.GetErrorMessage() << std::endl;
exit(1);
}
if (Mpd.GetState() > psStop) if (Mpd.GetState() > psStop)
{ {
if (argc > ++i) if (argc > ++i)
@@ -117,7 +122,7 @@ void ParseArgv(int argc, char **argv)
} }
std::cout << Mpd.GetCurrentSong().toString(now_playing_format) << "\n"; std::cout << Mpd.GetCurrentSong().toString(now_playing_format) << "\n";
} }
quit = 1; exit(0);
} }
else if (!strcmp(argv[i], "play")) else if (!strcmp(argv[i], "play"))
{ {
@@ -168,7 +173,7 @@ void ParseArgv(int argc, char **argv)
if (!Mpd.GetErrorMessage().empty()) if (!Mpd.GetErrorMessage().empty())
{ {
std::cout << "Error: " << Mpd.GetErrorMessage() << std::endl; std::cout << "Error: " << Mpd.GetErrorMessage() << std::endl;
exit(0); exit(1);
} }
if (i != argc) if (i != argc)
Mpd.SetVolume(Mpd.GetVolume()+atoi(argv[i])); Mpd.SetVolume(Mpd.GetVolume()+atoi(argv[i]));