head 1.6; access; symbols pkgsrc-2014Q1:1.5.0.4 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.2 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.4.0.54 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.52 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.50 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.48 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.46 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.44 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.42 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.40 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.38 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.36 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.34 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.32 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.30 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.28 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.26 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.24 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.22 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.20 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.18 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.16 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.14 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.12 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.10 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.8 pkgsrc-2008Q1:1.4.0.6 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.4 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.2 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.3.0.18 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.16 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.14 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.12 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.10 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.8 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.6 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.4 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.2 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.2.0.6 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.4 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.2 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.1.0.2 pkgsrc-2004Q2-base:1.1; locks; strict; comment @# @; 1.6 date 2014.06.09.12.27.51; author wiz; state dead; branches; next 1.5; commitid 5mM2ILodXn8wrQDx; 1.5 date 2013.10.02.14.17.25; author drochner; state Exp; branches; next 1.4; commitid H7ZjRvSLDf265J7x; 1.4 date 2007.08.09.04.03.58; author simonb; state Exp; branches; next 1.3; 1.3 date 2005.06.01.03.35.21; author simonb; state Exp; branches; next 1.2; 1.2 date 2004.06.29.08.26.38; author simonb; state Exp; branches; next 1.1; 1.1 date 2004.05.02.07.24.52; author mrg; state Exp; branches; next ; desc @@ 1.6 log @Update to 0.26. Remove playpause command, which was a local patch since 2005; upstream supports 'toggle' which does the same. If you want this alias, make upstream accept it. 0.26 (2014/06/03) * fix segfault when adding absolute paths * "playlist" can show stored playlist * "search" supports --format @ text @$NetBSD: patch-aa,v 1.5 2013/10/02 14:17:25 drochner Exp $ --- src/main.c.orig 2013-04-09 17:51:33.000000000 +0000 +++ src/main.c @@@@ -69,6 +69,7 @@@@ static struct command { {"prev", 0, 0, 0, cmd_prev, "", "Play the previous song in the current playlist"}, {"pause", 0, 0, 0, cmd_pause, "", "Pauses the currently playing song"}, {"toggle", 0, 0, 0, cmd_toggle, "", "Toggles Play/Pause, plays if stopped"}, + {"playpause", 0, 0, 0, cmd_toggle, "", "Pauses if playing, play otherwise"}, {"cdprev", 0, 0, 0, cmd_cdprev, "", "Compact disk player-like previous command"}, {"stop", 0, 0, 0, cmd_stop, "", "Stop the currently playing playlists"}, {"seek", 1, 1, 0, cmd_seek, "[+-][HH:MM:SS]|<0-100>%", "Seeks to the specified position"}, @ 1.5 log @update to 0.23 changes: -implement the client-to-client protocol -new command "cdprev" -make "mv" a shortcut for "move" -support absolute paths in "add" and "update" -more UI improvements -bugfixes, documentation improvements approved by simonb @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Update to version 0.12.1. Notable changes are: - New output format for "mpc playlist" - Support for many more search types with "mpc search" - Add "mpc del 0" behaviour to remove the currently playing song - Add outputs, enable and disable commands - multiple bug fixes. @ text @d3 1 a3 1 --- src/main.c.orig 2007-03-22 05:22:41.000000000 +1100 d5 1 a5 1 @@@@ -57,6 +57,7 @@@@ struct _mpc_table { d10 1 a12 1 {"clear", 0, 0, 0, cmd_clear, "", "Clear the current playlist"}, @ 1.3 log @Update to version 0.11.2: New commands: crop, stats, toggle. Add relative and exact-time seeking. Fix a few bugs. The new "toggle" command is the same as our existing patch for the "playpause" command - we keep the "playpause" command as an alias for "toggle". @ text @d3 1 a3 1 --- src/main.c.orig 2005-03-11 09:04:35.000000000 +0000 d6 7 a12 7 {"prev", 0, 0, 0, cmd_prev,"","Play the previous song in the current playlist"}, {"pause", 0, 0, 0, cmd_pause, "", "Pauses the currently playing song"}, {"toggle", 0, 0, 0, cmd_toggle, "", "Toggles Play/Pause, plays if stopped"}, + {"playpause", 0, 0, 0, cmd_toggle, "", "Pauses if playing, play otherwise"}, {"stop", 0, 0, 0, cmd_stop,"", "Stop the currently playing playlists"}, {"seek", 1, 1, 0, cmd_seek,"[+-][HH:MM:SS] or <0-100>%","Seeks to the specified position"}, {"clear", 0, 0, 0, cmd_clear,"", "Clear the current playlist"}, @ 1.2 log @Update to version 0.11.1. Changes include: . Support for new update command . Make add command more robust @ text @d3 10 a12 19 --- src/command.c.orig 2004-06-04 00:03:17.000000000 +1000 +++ src/command.c @@@@ -245,6 +245,16 @@@@ int cmd_play ( int argc, char ** argv, m return 1; } +int cmd_playpause ( int argc, char ** argv, mpd_Connection * conn ) +{ + mpd_Status * status = getStatus(conn); + + if(status->state==MPD_STATUS_STATE_PLAY) + return cmd_pause(argc,argv,conn); + else + return cmd_play(argc,argv,conn); +} + /* TODO: absolute seek times (normalperson) */ int cmd_seek ( int argc, char ** argv, mpd_Connection * conn ) { @ 1.1 log @add a "playpause" command, ala "xmms -t". this has already been submitted to musicpd.org. @ text @d3 3 a5 4 diff -ru src/command.c mpc-0.10.3.orig/src/command.c --- src/command.c 2004-03-20 10:40:02.000000000 +1100 +++ src/command.c 2004-05-02 16:49:23.000000000 +1000 @@@@ -228,6 +228,17 @@@@ d11 1 a11 1 + mpd_Status * status = mpd_getStatus(conn); d13 1 a13 2 + if(status->state==MPD_STATUS_STATE_PLAY || + status->state==MPD_STATUS_STATE_PAUSE) d19 3 a21 3 enum SeekMode { RelForward, RelBackward, Absolute }; static int calculate_seek(int current_time, int change, int mode) { @