diff options
author | Rasmus Steinke <rasi@xssn.at> | 2014-08-10 18:31:29 +0200 |
---|---|---|
committer | Rasmus Steinke <rasi@xssn.at> | 2014-08-10 18:31:29 +0200 |
commit | c03b7195f2540c19a6b6d56d8973be721c08a381 (patch) | |
tree | 20932561d8f053285a7553d0e12e2c0d1dbb518c /clerk | |
parent | d513a2c503024d4df2a228f1edbb586bb69df004 (diff) | |
download | perl-app-clerk-c03b7195f2540c19a6b6d56d8973be721c08a381.tar.gz perl-app-clerk-c03b7195f2540c19a6b6d56d8973be721c08a381.tar.xz |
made both functions seperate
Diffstat (limited to 'clerk')
-rwxr-xr-x | clerk | 43 |
1 files changed, 24 insertions, 19 deletions
@@ -366,7 +366,7 @@ managePlaylists () { elif [[ "$TRACKDISPLAY" == "Suspend Playlist" ]]; then suspendPlaylist elif [[ "$TRACKDISPLAY" == "Resume Playlist" ]]; then - suspendPlaylist + resumePlaylist elif [[ "$TRACKDISPLAY" == "Clear Playlist" ]]; then mpc clear && dplayQueue fi @@ -391,25 +391,30 @@ suspendPlaylist () { time=$(echo "$state" | awk -F ' ' '{ print $NF }' | sed 's/[)(]//g') song=$(mpc current --format '%file%') position=$(mpc current --format '%position%') + if [[ -z "$playing" ]]; then + echo "mpd is not playing" + else + mpc rm resume + mpc save resume + rm -f $HOME/.config/clerk/mpd_saved + echo "song="$song"" > $HOME/.config/clerk/mpd_saved + echo "pos="$position"" >> $HOME/.config/clerk/mpd_saved + echo "time="$time"" >> $HOME/.config/clerk/mpd_saved + fi +} - if [[ $1 == "save" ]]; then - if [[ -z "$playing" ]]; then - echo "mpd is not playing" - else - mpc rm resume - mpc save resume - rm -f $HOME/.config/clerk/mpd_saved - echo "song="$song"" > $HOME/.config/clerk/mpd_saved - echo "pos="$position"" >> $HOME/.config/clerk/mpd_saved - echo "time="$time"" >> $HOME/.config/clerk/mpd_saved - fi - elif [[ $1 == "load" ]]; then - source $HOME/.config/clerk/mpd_saved - mpc clear - mpc load resume - mpc play $pos - sleep 2 - mpc seek "$time" +resumePlaylist () { + playing=$(! mpc status | grep playing) + state=$(mpc status | tail -2 | head -1) + time=$(echo "$state" | awk -F ' ' '{ print $NF }' | sed 's/[)(]//g') + song=$(mpc current --format '%file%') + position=$(mpc current --format '%position%') + source $HOME/.config/clerk/mpd_saved + mpc clear + mpc load resume + mpc play $pos + sleep 2 + mpc seek "$time" fi } |