From 5ed91df8ecc5775ffa1df67f40526a62155f7e7e Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 5 Jan 2016 08:42:36 +0000 Subject: console: show tracklist shuffle status, too 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. --- bin/dtas-console | 3 +-- 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 -- cgit v1.2.3-24-ge0c7