diff options
author | Eric Wong <e@80x24.org> | 2016-01-05 08:42:36 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2016-01-05 08:42:36 +0000 |
commit | 5ed91df8ecc5775ffa1df67f40526a62155f7e7e (patch) | |
tree | bce8f670dde0b8829b87add9664813068f0a0c50 | |
parent | 44248402de9050418c78fc994fc433cb1a6372ae (diff) | |
download | dtas-5ed91df8ecc5775ffa1df67f40526a62155f7e7e.tar.gz |
We support this feature, so it should probably be shown along with the repeat status of the tracklist. Ensure we notify all of our listeners about the status change in player, too.
-rwxr-xr-x | bin/dtas-console | 3 | ||||
-rw-r--r-- | lib/dtas/player/client_handler.rb | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/bin/dtas-console b/bin/dtas-console index 5765cbd..1494bfb 100755 --- a/bin/dtas-console +++ b/bin/dtas-console @@ -199,9 +199,8 @@ begin Curses.clrtoeol cur_vol = rg['volume'] || 1.0 extra = [ "volume=#{cur_vol}" ] - repeat = 'false' tl = cur['tracklist'] || {} - extra << "repeat=#{tl['repeat'] || 'false'}" + %w(repeat shuffle).each { |x| extra << "#{x}=#{tl[x] || 'false'}" } trim = cur['trim'] || 'off' extra << "trim=#{trim}" Curses.addstr(extra.join(' ')) diff --git a/lib/dtas/player/client_handler.rb b/lib/dtas/player/client_handler.rb index 991b17f..a4308ff 100644 --- a/lib/dtas/player/client_handler.rb +++ b/lib/dtas/player/client_handler.rb @@ -622,7 +622,10 @@ module DTAS::Player::ClientHandler # :nodoc: when 'debug' then return io.emit(@tl.shuffle.to_yaml) # TODO: remove when nil else - set_bool(io, 'tl shuffle', v) { |b| @tl.shuffle = b } + set_bool(io, 'tl shuffle', v) do |b| + @tl.shuffle = b + __wall("tl shuffle #{b}") + end end io.emit("tl shuffle #{prev}") end |