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

actions: fix JumpToPositionInSong

Browse Source
This commit is contained in:
Andrzej Rybczak
2013-06-17 03:26:35 +02:00
parent 088eeddb69
commit af10ac883f
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/actions.cpp
View File

@@ -1573,17 +1573,19 @@ void JumpToPositionInSong::run()
return; return;
unsigned newpos = 0; unsigned newpos = 0;
if (position.find(':') != std::string::npos) // probably time in mm:ss size_t special_pos;
if ((special_pos = position.find(':')) != std::string::npos) // probably time in mm:ss
{ {
newpos = boost::lexical_cast<int>(position)*60 newpos = boost::lexical_cast<int>(position.substr(0, special_pos))*60
+ boost::lexical_cast<int>(position.substr(position.find(':')+1)); + boost::lexical_cast<int>(position.substr(special_pos +1));
if (newpos <= myPlaylist->currentSongLength()) if (newpos <= myPlaylist->currentSongLength())
Mpd.Seek(s.getPosition(), newpos); Mpd.Seek(s.getPosition(), newpos);
else else
Statusbar::msg("Out of bounds, 0:00-%s possible for mm:ss, %s given", s.getLength().c_str(), MPD::Song::ShowTime(newpos).c_str()); Statusbar::msg("Out of bounds, 0:00-%s possible for mm:ss, %s given", s.getLength().c_str(), MPD::Song::ShowTime(newpos).c_str());
} }
else if (position.find('s') != std::string::npos) // probably position in seconds else if ((special_pos = position.find('s')) != std::string::npos) // probably position in seconds
{ {
position.resize(special_pos);
newpos = boost::lexical_cast<int>(position); newpos = boost::lexical_cast<int>(position);
if (newpos <= s.getDuration()) if (newpos <= s.getDuration())
Mpd.Seek(s.getPosition(), newpos); Mpd.Seek(s.getPosition(), newpos);
@@ -1592,6 +1594,9 @@ void JumpToPositionInSong::run()
} }
else else
{ {
special_pos = position.find('%');
if (special_pos != std::string::npos)
position.resize(special_pos);
newpos = boost::lexical_cast<int>(position); newpos = boost::lexical_cast<int>(position);
if (newpos <= 100) if (newpos <= 100)
Mpd.Seek(s.getPosition(), s.getDuration()*newpos/100.0); Mpd.Seek(s.getPosition(), s.getDuration()*newpos/100.0);