lastbash-cvs Mailing List for Last.fm console player (Page 4)
Status: Beta
Brought to you by:
cstroie
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(27) |
Dec
(77) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(14) |
Feb
(8) |
Mar
(41) |
Apr
(5) |
May
(2) |
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2008 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
|
From: Costin S. <cs...@us...> - 2007-01-24 12:16:41
|
Update of /cvsroot/lastbash/lastbash In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1498 Modified Files: lastbash Log Message: Experimental support of user input for station change. Index: lastbash =================================================================== RCS file: /cvsroot/lastbash/lastbash/lastbash,v retrieving revision 1.112 retrieving revision 1.113 diff -u -d -r1.112 -r1.113 --- lastbash 24 Jan 2007 10:04:25 -0000 1.112 +++ lastbash 24 Jan 2007 12:16:34 -0000 1.113 @@ -202,7 +202,18 @@ debug "${FUNCNAME}: No missing programs" fi - # Check a minimum terminal size + # TODO Check some needed terminal capabilities + if tput longname >/dev/null 2>&1 + then + local TERM_LONGNAME="$(tput longname 2>/dev/null)" + debug "${FUNCNAME}: Using $(tput longname 2>/dev/null)" + else + debug "${FUNCNAME}: Unknown terminal: ${TERM}" + echo "Unknown terminal: ${TERM}" + exit 1 + fi + + # Ask for a minimum terminal size T_LINES=$(tput lines) T_COLUMNS=$(tput cols) if [ "${T_LINES}" -lt 15 ] || [ "${T_COLUMNS}" -lt 40 ] @@ -791,6 +802,9 @@ #----------------------------------------------------------------------------- function term_init() { + # Initialize the terminal according to the type of terminal + # in the environmental variable TERM + tput init # Enter special mode tput smcup # Set a welcome xterm title @@ -1626,6 +1640,238 @@ tui_sbar } +# Function: TUI for changing the station: input dialog {{{1 +#----------------------------------------------------------------------------- +function tui_station_change_input() +{ + # $1 - PARAMETER to store the input in + # $2 - prompt + + local RET READ_PARAMS + + # Move the cursor on lower-left corner and print + tput cup ${T_LINES} 0 + echo -ne "${T_COLOR_WHITE}${T_BGCOLOR_BLUE}${T_EL}" + # Make cursor normal visible + tput cnorm + # Enable terminal echo mode + stty echo + + # Add the prompt, if specified + [ "$2" ] && READ_PARAMS="-p $2: " + # Read the user input + if read -t 10 -e "${READ_PARAMS}" ${1} + then + [ "${!1}" ] && RET="0" || RET="1" + else + RET="2" + fi + + # Disable terminal echo mode + stty -echo + # Make cursor invisible + tput civis + + # Return the status code + return "${RET}" +} + +# Function: TUI for changing the station: full url {{{1 +#----------------------------------------------------------------------------- +function tui_station_change_url() +{ + local RET INPUT + + if tui_station_change_input INPUT "Last.fm URL" + then + if tui_lastfm_station "${INPUT}" + then + RET="0" + # Restore the metadata + tui_metadata + else + RET="1" + # Restore the status bar + tui_sbar + fi + else + RET="2" + # Restore the status bar + tui_sbar + fi + + # Return the status code + return "${RET}" +} + +# Function: TUI for changing the station: global tags {{{1 +#----------------------------------------------------------------------------- +function tui_station_change_globaltags() +{ + local RET INPUT + + if tui_station_change_input INPUT "Tags" + then + if tui_lastfm_station "lastfm://globaltags/${INPUT}" + then + RET="0" + # Restore the metadata + tui_metadata + else + RET="1" + # Restore the status bar + tui_sbar + fi + else + RET="2" + # Restore the status bar + tui_sbar + fi + + # Return the status code + return "${RET}" +} + +# Function: TUI for changing the station: group station {{{1 +#----------------------------------------------------------------------------- +function tui_station_change_group() +{ + local RET INPUT + + if tui_station_change_input INPUT "Group" + then + if tui_lastfm_station "lastfm://group/${INPUT}" + then + RET="0" + # Restore the metadata + tui_metadata + else + RET="1" + # Restore the status bar + tui_sbar + fi + else + RET="2" + # Restore the status bar + tui_sbar + fi + + # Return the status code + return "${RET}" +} + +# Function: TUI for changing the station: neighbours' station {{{1 +#----------------------------------------------------------------------------- +function tui_station_change_neighbours() +{ + local RET INPUT + + if tui_station_change_input INPUT "User's neighbours" + then + if tui_lastfm_station "lastfm://user/${INPUT}/neighbours" + then + RET="0" + # Restore the metadata + tui_metadata + else + RET="1" + # Restore the status bar + tui_sbar + fi + else + RET="2" + # Restore the status bar + tui_sbar + fi + + # Return the status code + return "${RET}" +} + +# Function: TUI for changing the station: recommended {{{1 +#----------------------------------------------------------------------------- +function tui_station_change_recommended() +{ + local RET INPUT + + if tui_station_change_input INPUT "Recommended to user" + then + if tui_lastfm_station "lastfm://user/${INPUT}/recommended/100" + then + RET="0" + # Restore the metadata + tui_metadata + else + RET="1" + # Restore the status bar + tui_sbar + fi + else + RET="2" + # Restore the status bar + tui_sbar + fi + + # Return the status code + return "${RET}" +} + +# Function: TUI for changing the station: similar artists {{{1 +#----------------------------------------------------------------------------- +function tui_station_change_similarartists() +{ + local RET INPUT + + if tui_station_change_input INPUT "Similar artists to" + then + if tui_lastfm_station "lastfm://artist/${INPUT}/similarartists" + then + RET="0" + # Restore the metadata + tui_metadata + else + RET="1" + # Restore the status bar + tui_sbar + fi + else + RET="2" + # Restore the status bar + tui_sbar + fi + + # Return the status code + return "${RET}" +} + +# Function: TUI for changing the station: fan {{{1 +#----------------------------------------------------------------------------- +function tui_station_change_fan() +{ + local RET INPUT + + if tui_station_change_input INPUT "Artist fan" + then + if tui_lastfm_station "lastfm://artist/${INPUT}/fans" + then + RET="0" + # Restore the metadata + tui_metadata + else + RET="1" + # Restore the status bar + tui_sbar + fi + else + RET="2" + # Restore the status bar + tui_sbar + fi + + # Return the status code + return "${RET}" +} + # Function: Check if the player is running {{{1 #----------------------------------------------------------------------------- function player_running() @@ -2109,6 +2355,14 @@ "${CTRL_L}") sigwinch ;; # Toggle debug mode "${CTRL_D}") tui_debug_toggle ;; + # Change station + "u") tui_station_change_url ;; + "t") tui_station_change_globaltags ;; + "g") tui_station_change_group ;; + "n") tui_station_change_neighbours ;; + "c") tui_station_change_recommended ;; + "a") tui_station_change_similarartists ;; + "f") tui_station_change_fan ;; # Player commands "x") player_load ;; "${CTRL_X}") player_start ;; |
|
From: Costin S. <cs...@us...> - 2007-01-24 10:04:28
|
Update of /cvsroot/lastbash/lastbash In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3725 Modified Files: lastbash Log Message: Disabled the read-based sleep function. Fixed the remote call key lock bug. Index: lastbash =================================================================== RCS file: /cvsroot/lastbash/lastbash/lastbash,v retrieving revision 1.111 retrieving revision 1.112 diff -u -d -r1.111 -r1.112 --- lastbash 24 Jan 2007 09:45:36 -0000 1.111 +++ lastbash 24 Jan 2007 10:04:25 -0000 1.112 @@ -155,7 +155,7 @@ # Function: Sleep function (interrupted by keypress) {{{1 #----------------------------------------------------------------------------- -function sleep() +function sleep_int() { # $1 - seconds to sleep |
|
From: Costin S. <cs...@us...> - 2007-01-24 09:45:44
|
Update of /cvsroot/lastbash/lastbash In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28596 Modified Files: lastbash Log Message: Log the remote call commands. Index: lastbash =================================================================== RCS file: /cvsroot/lastbash/lastbash/lastbash,v retrieving revision 1.110 retrieving revision 1.111 diff -u -d -r1.110 -r1.111 --- lastbash 27 Dec 2006 15:06:10 -0000 1.110 +++ lastbash 24 Jan 2007 09:45:36 -0000 1.111 @@ -1989,6 +1989,10 @@ # $1 - command # $2 - arguments (optional) + # Log the event + debug "${FUNCNAME}: Execute: $1 $2" + + # Select the command and execute it case "$1" in "REFRESH") tui_metadata ;; "STATION") tui_lastfm_station "$2" ;; |
|
From: Costin S. <cs...@us...> - 2006-12-27 15:06:17
|
Update of /cvsroot/lastbash/lastbash In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10184 Modified Files: lastbash Log Message: Use only GPL v2. Index: lastbash =================================================================== RCS file: /cvsroot/lastbash/lastbash/lastbash,v retrieving revision 1.109 retrieving revision 1.110 diff -u -d -r1.109 -r1.110 --- lastbash 27 Dec 2006 15:03:00 -0000 1.109 +++ lastbash 27 Dec 2006 15:06:10 -0000 1.110 @@ -6,8 +6,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# the Free Software Foundation; version 2 of the License. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
From: Costin S. <cs...@us...> - 2006-12-27 15:03:07
|
Update of /cvsroot/lastbash/lastbash In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv8666 Modified Files: lastbash Log Message: More checks and notifications. Index: lastbash =================================================================== RCS file: /cvsroot/lastbash/lastbash/lastbash,v retrieving revision 1.108 retrieving revision 1.109 diff -u -d -r1.108 -r1.109 --- lastbash 21 Dec 2006 14:55:33 -0000 1.108 +++ lastbash 27 Dec 2006 15:03:00 -0000 1.109 @@ -180,9 +180,13 @@ if [ "${BASH_VERSINFO[0]}" -lt "3" ] then echo "Bash version 3 is needed." + debug "${FUNCNAME}: Unsupported Bash version: $BASH_VERSION" exit 1 fi + # Note the bash version and the machine type + debug "${FUNCNAME}: Using Bash $BASH_VERSION on $MACHTYPE" + # Check some required programs debug "${FUNCNAME}: Checking for missing programs..." for P in ${REQ_PROGRAMS} @@ -293,6 +297,9 @@ HTTP_CLIENT="builtin" fi fi + + # INIT done + debug "${FUNCNAME}: Init done" } # Function: Quit {{{1 @@ -578,7 +585,11 @@ done # Check the returned data - if [[ "${LASTFM_SESSION}" =~ "failed" ]] + if [ ! "${LASTFM_SESSION}" ] + then + RET="4" + debug "${FUNCNAME}: No session retrieved" + elif [[ "${LASTFM_SESSION}" =~ "failed" ]] then RET="2" debug "${FUNCNAME}: Session failed" |
|
From: Costin S. <cs...@us...> - 2006-12-21 14:55:37
|
Update of /cvsroot/lastbash/lastbash In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv30635 Modified Files: lastbash Log Message: Disable local echo on normal operation. Index: lastbash =================================================================== RCS file: /cvsroot/lastbash/lastbash/lastbash,v retrieving revision 1.107 retrieving revision 1.108 diff -u -d -r1.107 -r1.108 --- lastbash 21 Dec 2006 14:03:19 -0000 1.107 +++ lastbash 21 Dec 2006 14:55:33 -0000 1.108 @@ -66,7 +66,7 @@ # Internal stuff PLAYERS="mplayer" HTTP_CLIENTS="wget curl" -REQ_PROGRAMS="rm date tput md5sum dd chmod" +REQ_PROGRAMS="rm date tput stty md5sum dd chmod" PLAYER_PID="" declare -a HTTP_HEADERS HTTP_RESPONSE declare -a HISTORY_ARTIST HISTORY_ALBUM HISTORY_TRACK HISTORY_DURATION HISTORY_MIN_SEC HISTORY_ACTION @@ -78,6 +78,10 @@ CTRL_S=$'\x13' CTRL_V=$'\x16' CTRL_X=$'\x18' +ARROW_UP=$'\x1b[A' +ARROW_DOWN=$'\x1b[B' +ARROW_LEFT=$'\x1b[D' +ARROW_RIGHT=$'\x1b[C' NUMBER_REGEXP="+([0-9])" # Set some shell options @@ -814,6 +818,8 @@ # Set the initial terminal size related settings term_resize + # Disable terminal echo mode + stty -echo # Make cursor invisible tput civis } @@ -830,6 +836,8 @@ tput clear # Make cursor normal visible tput cnorm + # Enable terminal echo mode + stty echo # Exit special mode tput rmcup } @@ -1757,12 +1765,13 @@ fi # Wait a second (or even longer, to let the stream be loaded) - sleep 5 + sleep 1 # Update the status line if [ "${RET}" == "0" ] then tui_sbar "Stream loaded and playing" "5" + tui_metadata else tui_sbar "Stream not loaded" fi |
|
From: Costin S. <cs...@us...> - 2006-12-21 14:03:22
|
Update of /cvsroot/lastbash/lastbash In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9352 Modified Files: lastbash Log Message: Minot fix. Index: lastbash =================================================================== RCS file: /cvsroot/lastbash/lastbash/lastbash,v retrieving revision 1.106 retrieving revision 1.107 diff -u -d -r1.106 -r1.107 --- lastbash 21 Dec 2006 13:59:58 -0000 1.106 +++ lastbash 21 Dec 2006 14:03:19 -0000 1.107 @@ -1815,7 +1815,7 @@ local RET # Set the status line - tui_sbar "Muting..." + tui_sbar "Muting/Unmuting..." # Stop playing if [ "${PLAYER}" == "mplayer" ] |
|
From: Costin S. <cs...@us...> - 2006-12-21 14:03:06
|
Update of /cvsroot/lastbash/lastbash In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv8948 Modified Files: TODO Log Message: One more TODO. Index: TODO =================================================================== RCS file: /cvsroot/lastbash/lastbash/TODO,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- TODO 13 Dec 2006 11:27:07 -0000 1.18 +++ TODO 21 Dec 2006 14:03:01 -0000 1.19 @@ -2,6 +2,7 @@ # $Id$ TODO +- show the status of the mute and pause commands in LED1 - do not send love, ban, skip if the track has changed in the meantime - more panels switchable by F-keys (Main, History, Artist...) - use arrow keys to browse the history |
|
From: Costin S. <cs...@us...> - 2006-12-21 14:00:03
|
Update of /cvsroot/lastbash/lastbash In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv7673 Modified Files: lastbash Log Message: Added support for mute and pause player commands. Index: lastbash =================================================================== RCS file: /cvsroot/lastbash/lastbash/lastbash,v retrieving revision 1.105 retrieving revision 1.106 diff -u -d -r1.105 -r1.106 --- lastbash 21 Dec 2006 13:47:11 -0000 1.105 +++ lastbash 21 Dec 2006 13:59:58 -0000 1.106 @@ -1771,6 +1771,75 @@ return "${RET}" } +# Function: Pause playing {{{1 +#----------------------------------------------------------------------------- +function player_pause() +{ + player_running || return + + local RET + + # Set the status line + tui_sbar "Pause/Unpause playing the stream..." + + # Stop playing + if [ "${PLAYER}" == "mplayer" ] + then + player_command "pause" + RET=$? + elif [ "${PLAYER}" == "mpg123" ] + then + player_command "pause" + RET=$? + else + RET="1" + debug "${FUNCNAME}: No supported player running" + tui_sbar "No supported player is running" + fi + + # Restore the status bar + sleep 1 + tui_sbar + + # Return the status + return "${RET}" +} + + +# Function: Mute the player {{{1 +#----------------------------------------------------------------------------- +function player_mute() +{ + player_running || return + + local RET + + # Set the status line + tui_sbar "Muting..." + + # Stop playing + if [ "${PLAYER}" == "mplayer" ] + then + player_command "mute" + RET=$? + elif [ "${PLAYER}" == "mpg123" ] + then + RET="1" + tui_sbar "Command not supported" + else + RET="1" + debug "${FUNCNAME}: No supported player running" + tui_sbar "No supported player is running" + fi + + # Restore the status bar + sleep 1 + tui_sbar + + # Return the status + return "${RET}" +} + # Function: Stop playing {{{1 #----------------------------------------------------------------------------- function player_stop() @@ -2020,6 +2089,7 @@ # Player commands "x") player_load ;; "${CTRL_X}") player_start ;; + "c") player_pause ;; "v") player_stop ;; "${CTRL_V}") player_quit ;; "m") player_mute ;; |
|
From: Costin S. <cs...@us...> - 2006-12-21 13:47:15
|
Update of /cvsroot/lastbash/lastbash In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2820 Modified Files: lastbash Log Message: Improved the player control and checking. Index: lastbash =================================================================== RCS file: /cvsroot/lastbash/lastbash/lastbash,v retrieving revision 1.104 retrieving revision 1.105 diff -u -d -r1.104 -r1.105 --- lastbash 21 Dec 2006 13:20:01 -0000 1.104 +++ lastbash 21 Dec 2006 13:47:11 -0000 1.105 @@ -1614,18 +1614,23 @@ { local RET + # If the PID is not null... if [ "${PLAYER_PID}" ] then + # And can be signalled... if kill -0 "${PLAYER_PID}" >/dev/null 2>&1 then RET="0" else RET="1" + PLAYER_PID="" fi else RET="1" + PLAYER_PID="" fi + # Return the status return "${RET}" } @@ -1637,11 +1642,24 @@ [ "${USE_PLAYER}" == "y" ] || return + local RET + if [ -p "${PLAYER_PIPE}" ] then - echo "$1" > "${PLAYER_PIPE}" - debug "${FUNCNAME} (${PLAYER}): $1" + if echo "$1" > "${PLAYER_PIPE}" + then + debug "${FUNCNAME} (${PLAYER}): Command \"$1\" sent" + RET="0" + else + debug "${FUNCNAME} (${PLAYER}): Command \"$1\" not sent" + RET="1" + fi + else + RET="1" fi + + # Return the status + return "${RET}" } # Function: Start the player {{{1 @@ -1655,7 +1673,6 @@ then tui_sbar "No way to control the player, mkfifo is absent" "2" debug "${FUNCNAME}: mkfifo is absent" - USE_PLAYER="n" return 1 fi @@ -1674,7 +1691,7 @@ else debug "${FUNCNAME}: Pipe not created" tui_sbar "Unable to create the player controlling pipe" "1" - return 1 + return 2 fi # Start the player in background @@ -1687,12 +1704,13 @@ mpg123 --remote --remote-err --quiet <"${PLAYER_PIPE}" >/dev/null 2>&1 & PLAYER_PID=$! else - debug "${FUNCNAME}: No player started" + debug "${FUNCNAME}: No supported player found" tui_sbar "No supported player found" fi # Wait a second sleep 1 + # Check if the player is still running if player_running then @@ -1704,9 +1722,10 @@ else debug "${FUNCNAME}: Could not start player ${PLAYER}" tui_sbar "Player ${PLAYER} could not be started" - RET="1" + RET="3" fi + # Return the status return "${RET}" } @@ -1717,6 +1736,8 @@ # Return if no player is to be used player_running || return + local RET + # Set the status line tui_sbar "Loading the stream..." @@ -1724,19 +1745,30 @@ if [ "${PLAYER}" == "mplayer" ] then player_command "loadfile ${LASTFM_STREAM}" + RET=$? elif [ "${PLAYER}" == "mpg123" ] then player_command "load ${LASTFM_STREAM}" + RET=$? else - debug "${FUNCNAME}: No player running" + debug "${FUNCNAME}: No supported player running" tui_sbar "No supported player is running" + RET="1" fi - # Wait a second - sleep 1 + # Wait a second (or even longer, to let the stream be loaded) + sleep 5 # Update the status line - tui_sbar "Stream loaded and playing" "1" + if [ "${RET}" == "0" ] + then + tui_sbar "Stream loaded and playing" "5" + else + tui_sbar "Stream not loaded" + fi + + # Return the status + return "${RET}" } # Function: Stop playing {{{1 @@ -1745,14 +1777,32 @@ { player_running || return + local RET + # Set the status line tui_sbar "Stop playing the stream..." - player_command "stop" + # Stop playing + if [ "${PLAYER}" == "mplayer" ] + then + RET="1" + tui_sbar "Command not supported" + elif [ "${PLAYER}" == "mpg123" ] + then + RET="1" + tui_sbar "Command not supported" + else + RET="1" + debug "${FUNCNAME}: No supported player running" + tui_sbar "No supported player is running" + fi # Restore the status bar sleep 1 tui_sbar + + # Return the status + return "${RET}" } # Function: Stop the player {{{1 @@ -1767,22 +1817,32 @@ if [ "${PLAYER}" == "mplayer" ] then player_command "quit" + RET=$? elif [ "${PLAYER}" == "mpg123" ] then kill "${PLAYER_PID}" + RET=$? else tui_sbar "No supported player is running" - debug "${FUNCNAME}: No player running" + debug "${FUNCNAME}: No supported player running" + RET="1" fi # Wait a second sleep 1 - # Remove the FIFO - rm -f "${PLAYER_PIPE}" + # Check the result + if [ "${RET}" == "0" ] + then + tui_sbar "Player closed" + # Remove the FIFO + rm -f "${PLAYER_PIPE}" + else + tui_sbar "Could not close the player" + fi - # Set the status line - tui_sbar "Player closed" + # Return the status + return "${RET}" } # Function: Check if another instance is running {{{1 @@ -1806,6 +1866,7 @@ RET="0" fi + # Return the status return "${RET}" } |
|
From: Costin S. <cs...@us...> - 2006-12-21 13:20:06
|
Update of /cvsroot/lastbash/lastbash In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv23768 Modified Files: lastbash Log Message: Keymapping changed. Index: lastbash =================================================================== RCS file: /cvsroot/lastbash/lastbash/lastbash,v retrieving revision 1.103 retrieving revision 1.104 diff -u -d -r1.103 -r1.104 --- lastbash 21 Dec 2006 13:16:47 -0000 1.103 +++ lastbash 21 Dec 2006 13:20:01 -0000 1.104 @@ -73,8 +73,11 @@ CR=$'\x0d' LF=$'\x0a' CTRL_D=$'\x04' +CTRL_H=$'\x08' CTRL_L=$'\x0c' CTRL_S=$'\x13' +CTRL_V=$'\x16' +CTRL_X=$'\x18' NUMBER_REGEXP="+([0-9])" # Set some shell options @@ -1948,16 +1951,16 @@ "k") tui_lastfm_command_skip ;; "p") tui_lastfm_rtp ;; "d") tui_lastfm_discovery ;; - "${CTRL_S}") tui_scroll_toggle ;; + "${CTRL_H}") tui_scroll_toggle ;; # Redisplay the TUI "${CTRL_L}") sigwinch ;; # Toggle debug mode "${CTRL_D}") tui_debug_toggle ;; # Player commands "x") player_load ;; - "X") player_start ;; + "${CTRL_X}") player_start ;; "v") player_stop ;; - "V") player_quit ;; + "${CTRL_V}") player_quit ;; "m") player_mute ;; # Quit "q") DONE="y" ;; |
|
From: Costin S. <cs...@us...> - 2006-12-21 13:16:51
|
Update of /cvsroot/lastbash/lastbash In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22489 Modified Files: lastbash Log Message: Detect if the player is running and display the led. Index: lastbash =================================================================== RCS file: /cvsroot/lastbash/lastbash/lastbash,v retrieving revision 1.102 retrieving revision 1.103 diff -u -d -r1.102 -r1.103 --- lastbash 12 Dec 2006 13:44:50 -0000 1.102 +++ lastbash 21 Dec 2006 13:16:47 -0000 1.103 @@ -67,6 +67,7 @@ PLAYERS="mplayer" HTTP_CLIENTS="wget curl" REQ_PROGRAMS="rm date tput md5sum dd chmod" +PLAYER_PID="" declare -a HTTP_HEADERS HTTP_RESPONSE declare -a HISTORY_ARTIST HISTORY_ALBUM HISTORY_TRACK HISTORY_DURATION HISTORY_MIN_SEC HISTORY_ACTION CR=$'\x0d' @@ -972,7 +973,7 @@ # - P: record to profile is on # - D: Discovery mode is on # - B: Debug mode is on - L1="-" + player_running && L1="R" || L1="-" [ "${META_RTP}" == "1" ] && L2="P" || L2="-" [ "${META_DISCOVERY}" == "1" ] && L3="D" || L3="-" [ "${DEBUG}" == "y" ] && L4="B" || L4="-" @@ -1604,6 +1605,27 @@ tui_sbar } +# Function: Check if the player is running {{{1 +#----------------------------------------------------------------------------- +function player_running() +{ + local RET + + if [ "${PLAYER_PID}" ] + then + if kill -0 "${PLAYER_PID}" >/dev/null 2>&1 + then + RET="0" + else + RET="1" + fi + else + RET="1" + fi + + return "${RET}" +} + # Function: Send commands to the player {{{1 #----------------------------------------------------------------------------- function player_command() @@ -1656,11 +1678,11 @@ if [ "${PLAYER}" == "mplayer" ] then mplayer -cache 512 -idle -slave -quiet -input file="${PLAYER_PIPE}" >/dev/null 2>&1 & - debug "${FUNCNAME}: Player ${PLAYER} started" + PLAYER_PID=$! elif [ "${PLAYER}" == "mpg123" ] then mpg123 --remote --remote-err --quiet <"${PLAYER_PIPE}" >/dev/null 2>&1 & - debug "${FUNCNAME}: Player ${PLAYER} started" + PLAYER_PID=$! else debug "${FUNCNAME}: No player started" tui_sbar "No supported player found" @@ -1668,11 +1690,21 @@ # Wait a second sleep 1 + # Check if the player is still running + if player_running + then + debug "${FUNCNAME}: Player ${PLAYER} started" + tui_sbar "Player started (${PLAYER})" + RET="0" + # Load the stream, if configured to + [ "${AUTO_PLAY}" == "y" ] && player_load + else + debug "${FUNCNAME}: Could not start player ${PLAYER}" + tui_sbar "Player ${PLAYER} could not be started" + RET="1" + fi - # Update the status line - tui_sbar "Player started (${PLAYER})" - - [ "${AUTO_PLAY}" == "y" ] && player_load + return "${RET}" } # Function: Load the stream in player {{{1 @@ -1680,7 +1712,7 @@ function player_load() { # Return if no player is to be used - [ "${USE_PLAYER}" != "y" ] && return + player_running || return # Set the status line tui_sbar "Loading the stream..." @@ -1708,7 +1740,7 @@ #----------------------------------------------------------------------------- function player_stop() { - [ "${USE_PLAYER}" != "y" ] && return + player_running || return # Set the status line tui_sbar "Stop playing the stream..." @@ -1724,7 +1756,7 @@ #----------------------------------------------------------------------------- function player_quit() { - [ "${USE_PLAYER}" != "y" ] && return + player_running || return # Set the status line tui_sbar "Closing the player..." @@ -1734,7 +1766,7 @@ player_command "quit" elif [ "${PLAYER}" == "mpg123" ] then - killall mpg123 + kill "${PLAYER_PID}" else tui_sbar "No supported player is running" debug "${FUNCNAME}: No player running" @@ -1888,6 +1920,9 @@ # Remove stale files rm -f "${PID_FILE}" "${PLAYER_PIPE}" "${COMMAND_FILE}" "${COMMAND_FILE_LOCK}" fi + + # Wait for all background processes to finish + wait } |
|
From: Costin S. <cs...@us...> - 2006-12-13 11:27:11
|
Update of /cvsroot/lastbash/lastbash In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv26885 Modified Files: TODO Log Message: One more todo. Index: TODO =================================================================== RCS file: /cvsroot/lastbash/lastbash/TODO,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- TODO 12 Dec 2006 12:45:05 -0000 1.17 +++ TODO 13 Dec 2006 11:27:07 -0000 1.18 @@ -2,6 +2,7 @@ # $Id$ TODO +- do not send love, ban, skip if the track has changed in the meantime - more panels switchable by F-keys (Main, History, Artist...) - use arrow keys to browse the history - add more led monitored stuff |
|
From: Costin S. <cs...@us...> - 2006-12-12 13:44:53
|
Update of /cvsroot/lastbash/lastbash In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9175 Modified Files: INSTALL lastbash Makefile VERSION Log Message: Version 0.3.2. Index: lastbash =================================================================== RCS file: /cvsroot/lastbash/lastbash/lastbash,v retrieving revision 1.101 retrieving revision 1.102 diff -u -d -r1.101 -r1.102 --- lastbash 12 Dec 2006 12:13:57 -0000 1.101 +++ lastbash 12 Dec 2006 13:44:50 -0000 1.102 @@ -37,7 +37,7 @@ PROG_NAME="lastbash" PROG_TITLE="LastBASH" PROG_DESC="Console player for Last.fm" -PROG_VER="0.3.1" +PROG_VER="0.3.2" AUTHOR="Costin Stroie" AUTHOR_EMAIL="cs...@us..." Index: VERSION =================================================================== RCS file: /cvsroot/lastbash/lastbash/VERSION,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- VERSION 6 Dec 2006 16:14:27 -0000 1.8 +++ VERSION 12 Dec 2006 13:44:50 -0000 1.9 @@ -1 +1 @@ -0.3.1 +0.3.2 Index: Makefile =================================================================== RCS file: /cvsroot/lastbash/lastbash/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile 6 Dec 2006 18:10:00 -0000 1.4 +++ Makefile 12 Dec 2006 13:44:50 -0000 1.5 @@ -4,7 +4,7 @@ # Project name and version name = lastbash -version = 0.3.1 +version = 0.3.2 # Targets proglist = lastbash Index: INSTALL =================================================================== RCS file: /cvsroot/lastbash/lastbash/INSTALL,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- INSTALL 6 Dec 2006 16:14:27 -0000 1.7 +++ INSTALL 12 Dec 2006 13:44:50 -0000 1.8 @@ -10,8 +10,8 @@ First, unpack the archive (replace the version number with the correct one) and enter the directory -$ tar xzf lastbash-0.3.1.tar.gz -$ cd lastbash-0.3.1 +$ tar xzf lastbash-0.3.2.tar.gz +$ cd lastbash-0.3.2 Then run the program (assuming bash is your shell) |
|
From: Costin S. <cs...@us...> - 2006-12-12 12:52:57
|
Update of /cvsroot/lastbash/blis_pages In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21001 Modified Files: News Log Message: Version up. Index: News =================================================================== RCS file: /cvsroot/lastbash/blis_pages/News,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- News 6 Dec 2006 13:43:27 -0000 1.2 +++ News 12 Dec 2006 12:52:52 -0000 1.3 @@ -4,6 +4,8 @@ (:DESCRIPTION:) News (:REVISION:) $Id$ +:2006.12.12 v0.3.1: The man page and the config file have been included. Chech for data validity pased in command line. Use getopts for parsing the command line parameters. Show a better help message. Added debug mode toggling direct fron interface. Fixed the player integration, especially the 'quit' sequence. More remote commands added. Save the current meta info to a file. Display detailed changing station errors. + :2006.12.06 v0.3.0: Use special terminal mode for program TUI. Use ncurses (tput) instead of direct escape sequences. Check for webservice errors. Multiple commands per remote call are supported. Check for a minimum terminal size before starting. Added support for external HTTP clients, fixed the Ubuntu related bug. Keep history in memory for redraw. Prevent race conditions in remote command calls. Better quitting sequence (trap signals). :2006.11.28 v0.2.3: The remote call support has been improved. The history has new headings and the action (Love, Skip, Ban) is displayed. The keys are displayed when the pressed key is not understood. |
|
From: Costin S. <cs...@us...> - 2006-12-12 12:49:42
|
Update of /cvsroot/lastbash/blis_pages In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv19771 Modified Files: Install Log Message: Vresion up. Index: Install =================================================================== RCS file: /cvsroot/lastbash/blis_pages/Install,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Install 6 Dec 2006 13:53:41 -0000 1.3 +++ Install 12 Dec 2006 12:49:39 -0000 1.4 @@ -13,8 +13,8 @@ First, unpack the archive (replace the version number with the correct one) and enter the directory - $ tar xzf lastbash-0.3.0.tar.gz - $ cd lastbash-0.3.0 + $ tar xzf lastbash-0.3.1.tar.gz + $ cd lastbash-0.3.1 Then run the program (assuming @@bash@@ is your shell) |
|
From: Costin S. <cs...@us...> - 2006-12-12 12:49:10
|
Update of /cvsroot/lastbash/blis_pages In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv19728 Modified Files: Home Log Message: Minor reformatting. Index: Home =================================================================== RCS file: /cvsroot/lastbash/blis_pages/Home,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Home 6 Dec 2006 12:51:53 -0000 1.2 +++ Home 12 Dec 2006 12:49:06 -0000 1.3 @@ -12,8 +12,9 @@ It displays the information of the current playing track, keeps a history of the played tracks and allows the user to perform some actions on the current track, such as ''love'', ''skip'' or ''ban''. To listen to Last.fm, you can use any player capable of mp3 streaming (such as [http://www.mplayerhq.hu|MPlayer], [http://www.mpg123.de|mpg123], [http://www.xmms.org|XMMS] and so on) by opening the M3U playlist that LastBASH saves on connecting. -But the recommended way is to use the LastBASH frontend features and let it run some compatible player in background (MPlayer or mpg123), that you can control through the same user interface. -This way you need to have only one console open to listen and control Last.fm. +But the recommended way is to use the LastBASH frontend features and let it run some compatible player in background (MPlayer or mpg123). +You can control the player through the same user interface. +This way you need to have only one console open for both listening and controlling Last.fm. = Last.fm = |
|
From: Costin S. <cs...@us...> - 2006-12-12 12:47:20
|
Update of /cvsroot/lastbash/blis_pages In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18939 Modified Files: Features Log Message: Now we have a manpage. Index: Features =================================================================== RCS file: /cvsroot/lastbash/blis_pages/Features,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Features 6 Dec 2006 12:46:13 -0000 1.2 +++ Features 12 Dec 2006 12:47:13 -0000 1.3 @@ -26,11 +26,3 @@ The TUI is created using some terminal features such as non-linear cursor movement, scrolling areas and color attributes, so you need a compatible terminal (Linux or Xterm are tested and they work). Starting with version 0.3.0, the program uses '''tput''' instead of plain escape sequences. -= Current version = - -For the moment, LastBASH lacks documentation (aka manpage), I know, I am working on it. - -But, if you are brave enough, you can run it and, if you have ''MPlayer'' installed and some supported terminal (such as @@linux@@ or @@xterm@@) it will work smoothly. -If you don't have MPlayer, open the playlist the program saves in @@~/.lastbash/playlist.m3u@@ with some streaming-capable mp3 player and play it. -You will be able to control Last.fm features from LastBASH while listening the stream with your favourite player. - |
|
From: Costin S. <cs...@us...> - 2006-12-12 12:45:08
|
Update of /cvsroot/lastbash/lastbash In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18004 Modified Files: TODO Log Message: One done. Index: TODO =================================================================== RCS file: /cvsroot/lastbash/lastbash/TODO,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- TODO 11 Dec 2006 22:59:24 -0000 1.16 +++ TODO 12 Dec 2006 12:45:05 -0000 1.17 @@ -3,7 +3,6 @@ TODO - more panels switchable by F-keys (Main, History, Artist...) -- use getopts - use arrow keys to browse the history - add more led monitored stuff - improve player support @@ -16,6 +15,7 @@ - add support for color and bw interface DONE +- use getopts - improve support for interface refresh (keep history) - implement the leds - maybe mark the loved/banned/skipped tracks |
|
From: Costin S. <cs...@us...> - 2006-12-12 12:44:20
|
Update of /cvsroot/lastbash/blis_pages In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv17719 Modified Files: ChangeLog Log Message: Version 0.3.1. Index: ChangeLog =================================================================== RCS file: /cvsroot/lastbash/blis_pages/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ChangeLog 6 Dec 2006 12:34:34 -0000 1.2 +++ ChangeLog 12 Dec 2006 12:44:16 -0000 1.3 @@ -4,6 +4,20 @@ (:DESCRIPTION:) LastBASH ChangeLog (:REVISION:) $Id$ +'''v0.3.1''' +* Chech for data validity in command line. +* Use getopts for parsing the command line parameters. +* Show a better help message. +* Now we have a manpage. +* Minimum terminal width reduced to 40 chars. +* Fixed the mkfifo detection. +* Added debug toggling support. +* Fixed the player integration, especially the 'quit' sequence. +* Added quick helps for HTTP client and player. +* More remote commands added. +* Save the current meta info to a file. +* Display detailed changing station errors. + '''v0.3.0''' * Hide the cursor. * Enter and leave terminal special mode. |
|
From: Costin S. <cs...@us...> - 2006-12-12 12:43:43
|
Update of /cvsroot/lastbash/lastbash In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv17324 Modified Files: ChangeLog Log Message: Version 0.3.1. Index: ChangeLog =================================================================== RCS file: /cvsroot/lastbash/lastbash/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ChangeLog 6 Dec 2006 12:12:51 -0000 1.4 +++ ChangeLog 12 Dec 2006 12:43:40 -0000 1.5 @@ -1,3 +1,17 @@ +v0.3.1 +* Chech for data validity in command line. +* Use getopts for parsing the command line parameters. +* Show a better help message. +* Now we have a manpage. +* Minimum terminal width reduced to 40 chars. +* Fixed the mkfifo detection. +* Added debug toggling support. +* Fixed the player integration, especially the 'quit' sequence. +* Added quick helps for HTTP client and player. +* More remote commands added. +* Save the current meta info to a file. +* Display detailed changing station errors. + v0.3.0 * Hide the cursor. * Enter and leave terminal special mode. |
|
From: Costin S. <cs...@us...> - 2006-12-12 12:37:50
|
Update of /cvsroot/lastbash/lastbash In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14913 Modified Files: README Log Message: Some content moved to manpage. Index: README =================================================================== RCS file: /cvsroot/lastbash/lastbash/README,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- README 6 Dec 2006 13:55:29 -0000 1.4 +++ README 12 Dec 2006 12:37:47 -0000 1.5 @@ -50,9 +50,9 @@ ===== Please see the INSTALL file for quick instructions about how to install -and launch LastBASH. You must have a compatible terminal (linux or xterm -are supported at the moment) and, if you wish to use the backend player, -you should have MPlayer. For now. +and launch LastBASH. You must have a compatible terminal (such as linux +or xterm) and, if you wish to use the backend player, you should have +MPlayer too. For now. After you have donwloaded, extracted and installed the program, run it. You do not need to pass any command line parameters, at least at first @@ -63,41 +63,20 @@ It will ask your Last.fm username and password. You should have one. If not, hmmm... go and create an account on Last.fm -There are some command line parameters you can use. - --u username - Specify the username to connect with. - --p player - Specify the backend player to use (auto or mplayer, for now). - --a - Automatically start playing. - --A - Do not start playing automatically. - --c command - Send the command to the running instance. - - -last.fm station - You can specify a new Last.fm station to connect to. - -You can also pass the Last.fm station name to tune directly into it. +There are some command line parameters you can use, please see the +lastbash(1) man page for more details. If you want to directly tune into +a Last.fm station, use this format (feel free to use any lastfm:// url +you like): -$ lastbash "lastfm://globaltags/rock" -$ lastbash "lastfm://globaltags/classic rock" -$ lastbash "lastfm://user/cstroie/neighbours" -$ lastbash "lastfm://artist/Rammstein/similarartists" +$ lastbash "lastfm://group/LastBASH" -Then, the program will try to connect. If it succeeds, it will save -a playlist in ~/.lastbash/playlist.m3u, for you to open with some -external player, if you don't want to use the backend it provides. +The program will try to connect. If it succeeds, it will save a playlist +in '~/.lastbash/playlist.m3u', for you to open with some external +player, if you don't want to use the backend it provides. If you have MPlayer (for the moment, this is the backend), it will start -playing. If not, you will have to tell LastBASH not to try to run it by -creating the ~/.lastbash/config file and adding this line: +playing. If you don't want to use the backend, you will have to tell +LastBASH not to try to run it by setting this in the configuration file: USE_PLAYER="n" @@ -119,17 +98,6 @@ $ mpg123 -C -v -@ ~/.lastbash/playlist.m3u -If one instance of LastBASH is already running, a second call can send -commands to the first one, for example: - -$ lastbash -c LOVE -$ lastbash -c SKIP -$ lastbash -c BAN - -Or you can change the station this way. - -$ lastbash "lastfm://group/LastBASH" - Key bindings ============ @@ -142,24 +110,10 @@ Skip track b Ban track -r - Refresh track metadata (refresh is automatic, but if you need to, - you can use this key to force a refresh) -p - Toggle "Record to Profile" (the P led will change status) - -d - Toggle "Discovery Mode" (the D led will change status) - -s - Toggle history scrolling direction - -CTRL-L - Redraw the interface - q Quit (and stop the backend player too) +For more keys, please see the lastbash(1) man page. Last.fm |
|
From: Costin S. <cs...@us...> - 2006-12-12 12:36:28
|
Update of /cvsroot/lastbash/blis_pages In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14516 Modified Files: Usage Log Message: The config file is already provided. Index: Usage =================================================================== RCS file: /cvsroot/lastbash/blis_pages/Usage,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Usage 6 Dec 2006 13:52:54 -0000 1.2 +++ Usage 12 Dec 2006 12:36:25 -0000 1.3 @@ -5,7 +5,7 @@ (:REVISION:) $Id$ Please see the [[Install]] page for quick instructions about how to install and launch LastBASH. -You must have a compatible terminal (linux or xterm are supported at the moment) and, if you wish to use the backend player, you should have MPlayer. +You must have a compatible terminal (such as linux or xterm) and, if you wish to use the backend player, you should have MPlayer too. For now. After you have donwloaded, extracted and installed the program, run it. @@ -27,7 +27,7 @@ If it succeeds, it will save a playlist in @@~/.lastbash/playlist.m3u@@, for you to open with some external player, if you don't want to use the backend it provides. If you have MPlayer (for the moment, this is the backend), it will start playing automatically. -If not, you will have to tell LastBASH not to try to run it by creating the @@~/.lastbash/config@@ file and adding this line: +If you don't want to use the backend, you will have to tell LastBASH not to try to run it by setting this in the configuration file: USE_PLAYER="n" @@ -80,7 +80,8 @@ = Key bindings = -Basic key bindings are the following: +Basic key bindings are the following. +Please see the man page for more details. :l:Love track :k:Skip track @@ -88,7 +89,8 @@ :r:Refresh track metadata (refresh is automatic, but if you need to, you can use this key to force a refresh) :p:Toggle ''"Record to Profile"'' (the '''P''' led will change status) :d:Toggle ''"Discovery mode"'' (the '''D''' led will change status) -:s:Toggle history scrolling direction +:^D:Toggle Debug mode :^L:Redraw the interface +:^S:Toggle history scrolling direction :q:Quit (and stop the backend player too) |
|
From: Costin S. <cs...@us...> - 2006-12-12 12:16:33
|
Update of /cvsroot/lastbash/lastbash In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6453 Modified Files: lastbash.1 Log Message: Updated for release. Index: lastbash.1 =================================================================== RCS file: /cvsroot/lastbash/lastbash/lastbash.1,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- lastbash.1 8 Dec 2006 13:50:05 -0000 1.4 +++ lastbash.1 12 Dec 2006 12:16:29 -0000 1.5 @@ -5,7 +5,7 @@ .\" .\" $Id$ .\" -.TH "lastbash" "1" "06 Dec 2006" "LastBASH" "Multimedia" +.TH "lastbash" "1" "12 Dec 2006" "LastBASH" "Multimedia" .SH "NAME" lastbash \- Console player for Last.fm .SH "SYNOPSIS" @@ -30,9 +30,11 @@ .TP .B -g \fIHTTP_client\fR Set the HTTP client to use for the webservice. +Use '-g help' for a list of supported HTTP clients. .TP .B -p \fIplayer\fR Set the backend player to use. +Use '-p help' for a list of supported players. .TP .B -r \fIrefresh_interval\fR Set the refresh interval, in seconds. @@ -64,7 +66,7 @@ .PP It will ask your Last.fm username and password. You should have one. -If not, hmmm... go and create an account on Last.fm +If not, hmmm... go and create an account on Last.fm. .PP You can also pass the Last.fm station name to tune directly into it. .PP @@ -78,7 +80,7 @@ Then, the program will try to connect. If it succeeds, it will save a playlist in \fI~/.lastbash/playlist.m3u\fR, for you to open with some external player, if you don't want to use the backend it provides. -If you have MPlayer (for the moment, this is the backend), it will start playing automatically. If not, you will have to tell LastBASH not to try to run it by creating the \fI~/.lastbash/config\fR file and adding this line: +If you have MPlayer (for the moment, this is the backend), it will start playing automatically. If not, you will have to tell LastBASH not to try to run it by setting this in the configuration file: .PP .nf USE_PLAYER="n" @@ -125,7 +127,7 @@ .B d Toggle "Discovery mode" (the D led will change status) .TP -.B s +.B ^S Toggle history scrolling direction .TP .B ^L @@ -174,6 +176,10 @@ .SH "LAST.FM" This is shameless self-promotion, I know. You can find me on Last.fm as \fIcstroie\fR and, if you like this player and want to share your experience, you can join the \fILastBASH\fR group and tell others about it. +.SH "FILES" +.TP +\fI~/.lastbash/config\fR, \fI/etc/lastbash.config\fR +Configuration files .SH "LICENSE" GNU General Public License .SH "AUTHORS" |
|
From: Costin S. <cs...@us...> - 2006-12-12 12:14:01
|
Update of /cvsroot/lastbash/lastbash In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5239 Modified Files: lastbash Log Message: Use CTRL-S for toggling scroll direction. Index: lastbash =================================================================== RCS file: /cvsroot/lastbash/lastbash/lastbash,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- lastbash 12 Dec 2006 12:03:31 -0000 1.100 +++ lastbash 12 Dec 2006 12:13:57 -0000 1.101 @@ -73,6 +73,7 @@ LF=$'\x0a' CTRL_D=$'\x04' CTRL_L=$'\x0c' +CTRL_S=$'\x13' NUMBER_REGEXP="+([0-9])" # Set some shell options @@ -1912,7 +1913,7 @@ "k") tui_lastfm_command_skip ;; "p") tui_lastfm_rtp ;; "d") tui_lastfm_discovery ;; - "s") tui_scroll_toggle ;; + "${CTRL_S}") tui_scroll_toggle ;; # Redisplay the TUI "${CTRL_L}") sigwinch ;; # Toggle debug mode |