ektoplayer 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55540b5adfb0dec28702908ee968d434b802221a
-  data.tar.gz: 5f11aef936c061803e546ea22a431193fa106685
+  metadata.gz: 6d45cf3f25e3f52e0d259b0396903d2bee9ae811
+  data.tar.gz: cee36a784279f4b0698adadfa8fb99df16b979be
 SHA512:
-  metadata.gz: '098d4f6de14917ac00d6321729827ca49469628b26d9a1b16ba3054660886893f6f5e7ef1837cdc3ebacae2703b8b56e835d6ecec5243ec5ee45bccc5ab8dff8'
-  data.tar.gz: 1bf895998e866f025d9b6d13775c0d32a9352c21a0aaa7fa6d4743885775444f43a741f86fc1a8288d8251d3ab35e7883aac23eb92471ab87df3e945c0d9ba63
+  metadata.gz: 82df89a2a491c4171a7f91f0d46d42e630d1ab1f942785a02ae570d13ecd9ac6f993eddfe720555c0b8bb256810c4d43a96bd2a6da5e24721b5123209e454bab
+  data.tar.gz: a553baadb74b75f7053a7dca15bb2305887482ff9596d04fb70acc68b4b22415655480d70a2554da70995c4caeafb0ed0cde08f19acc58093c54af627f7d933c

data/README.md

@@ -14,6 +14,7 @@ It allows you to
   * Vi-like keybindings (`hjkl`, `^d`, `^u`, `/`, `?`, `n`, `N`, ...)
   * Up to 256 colors are supported
   * Local sound file cache
+  * Song prefetching
 
 ## Screenshots
 
@@ -44,6 +45,10 @@ library to compile the native extensions.
     apt-get install ruby ruby-dev portaudio19-dev libmpg123-dev sqlite3 libsqlite3-dev libncurses-dev libz1g-dev build-essential
     gem install ektoplayer
 
+## Configuration
+
+Have a look at the default [ektoplayer.rc](https://github.com/braph/ektoplayer/blob/master/doc/ektoplayer.rc).
+
 ## Authors
 
   * [Benjamin Abendroth](https://github.com/braph)

data/lib/ektoplayer/application.rb

@@ -10,7 +10,7 @@ require 'date'
 
 module Ektoplayer
    class Application
-      VERSION = '0.1.4'.freeze
+      VERSION = '0.1.5'.freeze
       GITHUB_URL = 'https://github.com/braph/ektoplayer'.freeze
       EKTOPLAZM_URL = 'http://www.ektoplazm.com'.freeze
 
@@ -35,7 +35,7 @@ module Ektoplayer
 
       def run
          #Thread.abort_on_exception=(true)
-         Thread.report_on_exception=(true) rescue nil
+         Thread.report_on_exception=(true) if Thread.public_method_defined? :report_on_exception
 
          # make each configuration object globally accessible as a singleton
          [Config, Bindings, Theme].each { |c| Common::mksingleton(c) }
@@ -121,14 +121,18 @@ module Ektoplayer
                
                if Config[:prefetch]
                   trackloader_mutex = Mutex.new
+                  @prefetch_thread = nil
                   player.events.on(:position_change) do
-                     Thread.new do
-                        if player.length > 30 and player.position_percent > 0.8
+                     @prefetch_thread ||= Thread.new do
+                        if player.length > 30 and player.position_percent > 0.7
                            trackloader_mutex.synchronize do
                               trackloader.get_track_file(playlist[playlist.get_next_pos]['url'])
-                              sleep 5
+                              sleep 30
                            end
                         end
+
+                        sleep 10
+                        @prefetch_thread = nil
                      end
                   end
                end

data/lib/ektoplayer/bindings.rb

@@ -135,7 +135,7 @@ module Ektoplayer
                # browser
                :'browser.add_to_playlist' => [' ', ?a                        ],
                :'browser.enter'           => [?E,      Curses::KEY_ENTER     ],
-               :'browser.back'            => [?b,      Curses::KEY_BACKSPACE ]},
+               :'browser.back'            => [?B,      Curses::KEY_BACKSPACE ]},
             help: {
                :'help.top'                => [?g,      Curses::KEY_HOME      ],
                :'help.bottom'             => [?G,      Curses::KEY_END       ],
@@ -155,7 +155,7 @@ module Ektoplayer
 
          @bindings.default_proc = proc { |h,k| fail "Unknown widget #{k}" }
          @bindings.each do |widget, hash|
-            hash.default_proc = proc { |h,k| h[k] = {} }
+            hash.default_proc = proc { |h,k| h[k] = [] }
             hash.values.each do |keys|
                keys.map! { |key| parse_key(key) }
             end
@@ -181,6 +181,8 @@ module Ektoplayer
             key.to_sym
          elsif key.size == 2 and key.start_with?(?^)
             Curses.const_get("KEY_CTRL_#{key[1].upcase}")
+         elsif key =~ /^(key_)?space$/i
+            :' '
          else
             key = key.upcase.tr(?-, ?_)
             key = "KEY_#{key}" unless key.start_with?('KEY_')
@@ -192,9 +194,9 @@ module Ektoplayer
 
       def bind(widget, key, command)
          widget, command = widget.to_sym, command.to_sym
-         fail "Unknown command #{command}" unless COMMANDS.include? command
+         fail "Unknown command #{command}" unless @commands.include? command
 
-         @bindings[widget][command].delete parse_key(key)
+         @bindings[widget][command].delete parse_key(key) rescue nil
          @bindings[widget][command] << parse_key(key)
          check_collisions
       end
@@ -205,6 +207,12 @@ module Ektoplayer
          end
       end
 
+      def unbind_all
+         @bindings.each do |widget, commands|
+            commands.clear
+         end
+      end
+
       def bind_view(section, view, view_operations, operations)
          @bindings[section.to_sym].each do |command, keys|
             keys.each do |key|
@@ -217,14 +225,20 @@ module Ektoplayer
       private def check_collisions
          global_keys = @bindings[:global].values.flatten
          global_keys.each do |k|
-            fail "Double binding in 'global': #{k}" if global_keys.count(k) > 1
+            fail "Double binding in 'global', key #{keyname(k)}" if global_keys.count(k) > 1
          end
 
          @bindings.each_pair do |widget, commands|
+            next if widget == :global
             widget_keys = commands.values.flatten
             widget_keys.each do |k|
-               fail "Double binding in '#{widget}': #{k}"        if widget_keys.count(k) > 1
-               fail "Double binding in 'global/#{widget}': #{k}" if global_keys.include? k
+               if widget_keys.count(k) > 1
+                  fail "Double binding in '#{widget}', key `#{keyname(k)}`"
+               end
+
+               if global_keys.include? k
+                  fail "Double binding in 'global <> #{widget}', key #{keyname(k)}"
+               end
             end
          end
       end

data/lib/ektoplayer/common.rb

@@ -1,4 +1,43 @@
 require 'zip'
+require 'thread'
+
+class ConditionSignals
+   def initialize
+      @mutex, @cond = Mutex.new, ConditionVariable.new
+      @curr_signal = nil
+      @signal_hooks = {}
+
+      Thread.new do
+         @mutex.synchronize do
+            loop do
+               @cond.wait(@mutex)
+
+               if @signal_hooks.key? @curr_signal
+                  @signal_hooks[@curr_signal].()
+               end
+            end
+         end
+      end
+   end
+
+   def wait(name, timeout=nil)
+      @mutex.synchronize do
+         loop do
+            @cond.wait(@mutex, timeout)
+            return if @curr_signal == name
+         end
+      end
+   end
+
+   def signal(name)
+      @curr_signal = name
+      @cond.broadcast
+   end
+
+   def on(name, &block)
+      @signal_hooks[name] = block
+   end
+end
 
 class Object
    alias :frz :freeze

data/lib/ektoplayer/compat.rb

@@ -2,7 +2,7 @@ unless Array.public_method_defined? :sum
    class Array
       def sum
          result = 0
-         self.each { |i| result += 1 }
+         self.each { |i| result += i }
          result
       end
    end

data/lib/ektoplayer/config.rb

@@ -52,20 +52,20 @@ module Ektoplayer
 
       DEFAULT_PLAYLIST_FORMAT = (
          '<number size="3" fg="magenta" />' +
-         '<artist rel="33" fg="blue"    />' +
-         '<album  rel="33" fg="red"     />' +
+         '<artist rel="25" fg="blue"    />' +
+         '<album  rel="30" fg="red"     />' +
          '<title  rel="33" fg="yellow"  />' +
          '<styles rel="20" fg="cyan"    />' +
          '<bpm    size="4" fg="green" justify="right" />').freeze
 
       DEFAULT_PLAYINGINFO_FORMAT1 =
-         '<text fg="black">──┤ </text><title bold="on" fg="yellow" /><text fg="black"> ├──</text>'.freeze
+         '<text fg="black">&lt;&lt; </text><title bold="on" fg="yellow" /><text fg="black"> &gt;&gt;</text>'.freeze
 
       DEFAULT_PLAYINGINFO_FORMAT2 = 
          '<artist bold="on" fg="blue" /><text> - </text><album bold="on" fg="red" /><text> (</text><date fg="cyan" /><text>)</text>'.freeze
 
       def register(key, description, default, method=nil)
-         @doc[key.to_sym] = description.squeeze(' ').freeze
+         # parameter `description` is used by tools/mkconfig.rb, but not here
 
          if method
             @cast[key.to_sym]    = method if method
@@ -78,23 +78,24 @@ module Ektoplayer
 
       def initialize
          @options = Hash.new { |h,k| fail "Unknown option #{k}" }
-         @doc, @cast = {}, {}
+         @cast = {}
 
-         reg :database_file, 'File to store metadata',
+         reg :database_file, 'Database file for storing ektoplazm metadata',
             File.join(CONFIG_DIR, 'meta.db'),
             File.method(:expand_path)
 
-         reg :log_file, 'Log file',
+         reg :log_file, 'File used for logging',
             File.join(CONFIG_DIR, 'ektoplayer.log'),
             File.method(:expand_path)
 
-         reg :temp_dir, %{Where to temporary store mp3 files. Directory will be created 
-                          if it does not exist (parent directories will NOT be created},
+         reg :temp_dir, %{Temporary dir for downloading mp3 files. They will be moved to `cache_dir`
+                          after the download completed and was successful.
+                          Directory will be created if it does not exist, parent directories will not be created.},
             '/tmp/.ektoplazm',
             File.method(:expand_path)
 
          reg :cache_dir,
-            'Directory for storing mp3 files',
+            'Directory for storing cached mp3 files',
             File.join(Dir.home, '.cache', 'ektoplayer'),
             File.method(:expand_path)
 
@@ -109,18 +110,21 @@ module Ektoplayer
 
          reg :auto_extract_to_archive_dir,
             %{Enable/disable automatic extraction of downloaded MP3
-             archives from download_dir to archive_dir}, true
+             archives from `download_dir' to `archive_dir'}, true
 
          reg :delete_after_extraction,
-            %{In combination with auto_extract_to_archive_dir:
+            %{In combination `with auto_extract_to_archive_dir':
              Delete zip archive after successful extraction}, true
 
          reg :playlist_load_newest,
             %{How many tracks from database should be added to
-              the playlist on application start}, 100
+              the playlist on application start.}, 100
 
          reg :use_cache,
-            'Enable/disable local mp3 cache', true
+            %{Enable/disable local mp3 cache.
+              If this option is disabled, the downloaded mp3 files won't be moved
+              from `cache_dir`. Instead they will reside in `temp_dir` and will
+              be deleted on application exit.}, true
 
          reg :prefetch,
             'Enable prefetching next track do be played', true
@@ -149,24 +153,21 @@ module Ektoplayer
          reg 'progressbar.display',
             'Enable/disable progressbar', true
 
-         reg 'progressbar.download_char',
-            'Character used for displaying download progress', ?-
-
          reg 'progressbar.progress_char',
-            'Character used for displaying playing progress',  '─'
+            'Character used for displaying playing progress', ?~
 
          reg 'progressbar.rest_char',
-            'Character used for the rest of the line', '─'
+            'Character used for the rest of the line', ?~
 
          # - Volumemeter
          reg 'volumemeter.display',
             'Enable/disable volumemeter', true
 
          reg 'volumemeter.level_char',
-            'Character used for displaying volume level', '·'
+            'Character used for displaying volume level', ?~
 
          reg 'volumemeter.rest_char',
-            'Character used for the rest of the line', '·'
+            'Character used for the rest of the line', ?~
 
          # - Playinginfo
          reg 'playinginfo.display',
@@ -225,11 +226,12 @@ module Ektoplayer
            set:        self.method(:set),
            bind:       bindings.method(:bind),
            unbind:     bindings.method(:unbind),
+           unbind_all: bindings.method(:unbind_all),
            color:      theme.method(:color),
            color_256:  theme.method(:color_256),
            color_mono: theme.method(:color_mono)
          }
-         callbacks.default_proc = proc { |h,k| fail "unknown command: #{k}" }
+         callbacks.default_proc = proc { fail 'unknown command' }
          callbacks.freeze
 
          open(file, ?r).readlines.each do |line|
@@ -239,10 +241,10 @@ module Ektoplayer
 
             begin
                cb = callbacks[command.to_sym]
-               fail "missing arguments for #{command}" if args.size != cb.arity
                cb.call(*args)
+               #fail "Command '#{command}' given args: #{args.size}, wanted #{cb.arity}" if args.size != cb.arity
             rescue
-               fail "#{file}:#{$.}: #{$!}"
+               fail "#{file}:#{$.}: #{command}: #{$!}"
             end
          end
       end

data/lib/ektoplayer/operations/playlist.rb

@@ -19,7 +19,7 @@ module Ektoplayer
                @trackloader.download_album(track['url']) rescue (
                   Application.log(self, $!)
                )
-            end
+            end.join(0.3) # prevent too many hits
          end
 
          def reload(index)
@@ -28,13 +28,15 @@ module Ektoplayer
                @trackloader.get_track_file(track['url'], reload: true) rescue (
                   Application.log(self, $!)
                )
-            end
+            end.join(0.3) # prevent too many hits
          end
 
          def play(index)
             return unless track = @playlist[index]
             @playlist.current_playing=(index)
-            @player.play(@trackloader.get_track_file(track['url']))
+            Thread.new do
+               @player.play(@trackloader.get_track_file(track['url']))
+            end.join(0.3) # prevent too many hits
          end
 
          def play_next

data/lib/ektoplayer/theme.rb

@@ -2,7 +2,7 @@ require_relative 'ui/colors'
 
 module Ektoplayer
    class Theme
-      attr_reader :current
+      attr_reader :current, :theme
 
       def initialize
          @current = 0
@@ -71,6 +71,7 @@ module Ektoplayer
       end
 
       def color(name, *defs, theme: 8)
+         defs.map! { |d| Integer(d) rescue d.to_sym }
          @theme[theme][name.to_sym] = defs.freeze
       end
 
@@ -81,7 +82,7 @@ module Ektoplayer
       def [](theme_def)      UI::Colors.get(theme_def)  end
 
       def use_colors(colors)
-         fail ArgumentError, 'unknown theme' unless @theme[colors]
+         fail 'unknown theme' unless @theme[colors]
          @current = colors
 
          UI::Colors.reset

data/lib/ektoplayer/trackloader.rb

@@ -114,31 +114,44 @@ module Ektoplayer
          @file     = File.open(filename, ?w)
          @progress = 0
          @error    = nil
+         @tries    = 3
       end
 
       def start!
-         Application.log(self, 'starting download: ', @url)
+         Application.log(self, 'starting download:', @url)
 
          Thread.new do
             begin
-               http = Net::HTTP.new(@url.host, @url.port)
-
-               http.request(Net::HTTP::Get.new(@url.request_uri)) do |res|
-                  fail res.body unless res.code == '200'
-
-                  @total = res.header['Content-Length'].to_i
-
-                  res.read_body do |chunk|
-                     @progress += chunk.size
-                     @events.trigger(:progress, @progress)
-                     @file << chunk
+               loop do
+                  begin
+                     http = Net::HTTP.new(@url.host, @url.port)
+                     @file.rewind
+                     @progress, @total = 0, nil
+
+                     http.request(Net::HTTP::Get.new(@url.request_uri)) do |res|
+                        fail res.body unless res.code == '200'
+
+                        @total = res.header['Content-Length'].to_i
+
+                        res.read_body do |chunk|
+                           @progress += chunk.size
+                           @events.trigger(:progress, @progress)
+                           @file << chunk
+                        end
+                     end
+
+                     fail 'filesize mismatch' if @progress != @total
+                     @file.flush
+                     @events.trigger(:completed)
+                     break
+                  rescue
+                     if (@tries -= 1) < 1
+                        @events.trigger(:failed, (@error = $!))
+                        break
+                     end
+                     Application.log(self, 'retrying failed DL', $!)
                   end
                end
-
-               fail 'filesize mismatch' if @progress != @total
-               @events.trigger(:completed)
-            rescue
-               @events.trigger(:failed, (@error = $!))
             ensure
                @file.close
             end

data/lib/ektoplayer/ui/widgets.rb

@@ -32,7 +32,7 @@ module UI
       # as draw, layout and refresh) are executed once and only once at the
       # end of this function.
       def with_lock
-         held_locks = lock; yield
+         lock; yield
       ensure
          unlock
       end
@@ -42,26 +42,45 @@ module UI
       end
 
       def unlock
-         return unless (@lock.exit rescue nil) or not visible?
+         return unless (@lock.exit rescue nil)
 
-         layout   if @want >= WANT_LAYOUT
-         draw     if @want >= WANT_REDRAW
-         if @want >= WANT_REFRESH
-            Canvas.update_screen
+         if @want & WANT_LAYOUT > 0 
+            layout;
+            @want ^= WANT_LAYOUT
+         end
+         return   if not visible?
+
+         if @want & WANT_REDRAW > 0
+            draw
+            @want ^= WANT_REDRAW
          end
 
-         @want = 0
+         if @want > 0 #& WANT_REFRESH > 0
+            Canvas.update_screen
+            @want ^= WANT_REFRESH
+         end
       end
 
-      def display(force_refresh=false, force_redraw=false)
+      def display(force_refresh=false, force_redraw=false, force_layout=false)
+         if @want & WANT_LAYOUT > 0  or force_layout
+            layout;
+            @want ^= WANT_LAYOUT
+         end
          return   if not visible?
-         layout   if @want >= WANT_LAYOUT
-         draw     if @want >= WANT_REDRAW or force_redraw
-         refresh  if @want >= WANT_REFRESH or force_refresh
+
+         if @want & WANT_REDRAW > 0 or force_redraw
+            draw
+            @want ^= WANT_REDRAW
+         end
+
+         if @want > 0 or force_refresh #WANT_REFRESH > 0 or force_refresh
+            refresh
+            @want ^= WANT_REFRESH
+         end
       end
 
-      def want_redraw;  @want |= WANT_REDRAW   end
-      def want_layout;  @want |= WANT_LAYOUT   end
+      def want_redraw;  @want |= 3             end
+      def want_layout;  @want = 7              end
       def want_refresh; @want |= WANT_REFRESH  end
 
       def invisible?;  !visible?                                     end

data/lib/ektoplayer/ui.rb

@@ -6,6 +6,8 @@ require_relative 'ui/colors'
 require_relative 'events'
 
 module UI
+   CONDITION_SIGNALS = ConditionSignals.new
+
    class WidgetSizeError < Exception; end
 
    class Canvas
@@ -36,19 +38,7 @@ module UI
       end
 
       def self.enable_resize_detection
-         @@winch_mutex ||= Mutex.new
-         @@winch_cond  ||= ConditionVariable.new
-
-         Signal.trap('WINCH') { @@winch_cond.signal }
-
-         @@winch_thread ||= Thread.new do
-            loop do
-               @@winch_mutex.synchronize do
-                  @@winch_cond.wait(@@winch_mutex)
-                  self.on_winch
-               end
-            end
-         end
+         Signal.trap('WINCH') { @@want_resize = true }
       end
 
       def self.widget;      @@widget                   end
@@ -57,19 +47,6 @@ module UI
       def self.visible?;    true                       end
       def self.inivsibile?; false                      end
 
-      def self.on_winch
-         h, w = IO.console.winsize()
-         Curses.resizeterm(h, w)
-         Curses.refresh
-         @@widget.size=(Size.new(height: h, width: w)) if @@widget
-      rescue UI::WidgetSizeError
-         Curses.clear
-         Curses.addstr('terminal too small!')
-         Curses.refresh
-      rescue
-         nil
-      end
-
       def self.sub(cls, **opts)
          @@widget ||= (widget = cls.new(parent: self, **opts))
          widget
@@ -82,20 +59,26 @@ module UI
       
       def self.update_screen(force_redraw=false)
          @@updating ||= Mutex.new
+         @@want_resize ||= false
 
          if @@updating.try_lock
-            if force_redraw
-               Curses.clear
-               Curses.refresh
-            end
-
             begin
-               @@widget.display(true, force_redraw) if @@widget and (@@mode ||= :curses) == :curses
+               if @@want_resize
+                  @@want_resize = false
+                  h, w = IO.console.winsize()
+                  Curses.resizeterm(h, w)
+                  Curses.clear
+                  Curses.refresh
+                  @@widget.size=(Size.new(height: h, width: w)) if @@widget
+                  @@widget.display(true, true, true) if @@widget
+               else
+                  @@widget.display(true, force_redraw) if @@widget
+               end
             rescue UI::WidgetSizeError
                Curses.clear
                Curses.addstr('terminal too small!')
             rescue
-               Application.log(self, $!)
+               Ektoplayer::Application.log(self, $!)
             end
 
             Curses.doupdate
@@ -166,13 +149,17 @@ module UI
                         end
                      end
                   end
+               rescue
+                  # getch() returned something weird that could not be chr()d
                end while @@readline_obj.active?
             end
          end
       end
 
       def self.readline(*args, **opts, &block)
-         (@@readline_obj ||= ReadlineWindow.new).readline(*args, **opts, &block)
+         (@@readline_obj ||= ReadlineWindow.new).readline(*args, **opts) do
+            Canvas.class_variable_get('@@updating').synchronize { yield }
+         end
       end
    end
 
@@ -190,17 +177,18 @@ module UI
          @thread ||= Thread.new do
             window = Curses::Window.new(size.height, size.width, pos.y, pos.x)
 
+            rlt = Thread.new { Readline.readline(prompt, add_hist) }
             Readline.set_screen_size(size.height, size.width)
             Readline.delete_text
-            rlt = Thread.new { Readline.readline(prompt, add_hist) }
+            @readline_in_write.read_nonblock(100) rescue nil
 
             while rlt.alive?
                window.erase
-               buffer = "#{prompt}#{Readline.line_buffer}"
+               buffer = prompt + Readline.line_buffer.to_s
                window << buffer[(buffer.size - size.width).clamp(0, buffer.size)..-1]
                window.cursor=(Point.new(x: Readline.point + prompt.size, y: 0))
                window.refresh
-               @mutex.synchronize { @cond.wait(@mutex, 0.2) }
+               CONDITION_SIGNALS.wait(:readline, 0.2)
             end
 
             window.clear
@@ -212,7 +200,7 @@ module UI
 
       def feed(c)
          @readline_in_write.write(c)
-         @cond.signal
+         CONDITION_SIGNALS.signal(:readline)
          @thread = nil if c == ?\n
       end
    end

data/lib/ektoplayer/views/help.rb

@@ -30,7 +30,7 @@ module Ektoplayer
                   end
 
                   @win.with_attr(Theme[:'help.command_name']) do
-                     @win.on_column(18).addstr("#{name}")
+                     @win.on_column(18).addstr(name.to_s)
                   end
 
                   @win.with_attr(Theme[:'help.command_desc']) do

data/lib/ektoplayer/views/info.rb

@@ -37,7 +37,7 @@ module Ektoplayer
 
             @win.from_left(START_TAG_VALUE)
             @win.with_attr(Theme[:'info.value']) do
-               @win.addstr("#{value}")
+               @win.addstr(value.to_s)
             end
          end
          
@@ -48,7 +48,7 @@ module Ektoplayer
 
             @win.from_left(START_INFO_VALUE)
             @win.with_attr(Theme[:'info.value']) do
-               @win.addstr("#{value}")
+               @win.addstr(value.to_s)
             end
          end
 
@@ -161,7 +161,7 @@ module Ektoplayer
                @trackloader.downloads.each do |dl|
                   name = File.basename(dl.filename)
                   percent = Float(dl.progress) / dl.total * 100
-                  percent = "%0.2f" % percent
+                  percent = '%0.2f' % percent
                   draw_download(name, ?( + percent + '%)', dl.error)
                end
                @win.next_line

data/lib/ektoplayer/views/mainwindow.rb

@@ -11,11 +11,11 @@ module Ektoplayer
          def initialize(**opts)
             super(**opts)
 
-            @playinginfo  = sub(PlayingInfo)
-            @progressbar  = sub(ProgressBar)
-            @volumemeter  = sub(VolumeMeter)
-            @tabbar       = sub(TabBar)
-            @windows      = sub(UI::SwitchContainer)
+            @playinginfo  = sub(PlayingInfo, size: @size.update(height: 2))
+            @progressbar  = sub(ProgressBar, size: @size.update(height: 1))
+            @volumemeter  = sub(VolumeMeter, size: @size.update(height: 1))
+            @tabbar       = sub(TabBar,      size: @size.update(height: 1))
+            @windows      = sub(UI::SwitchContainer, size: @size.calc(height: -4))
             @help         = @windows.sub(Help, visible: false)
             @info         = @windows.sub(Info, visible: false)
             @splash       = @windows.sub(Splash, visible: false)
@@ -29,8 +29,8 @@ module Ektoplayer
 
             Config[:'main.widgets'].each { |w| add(send(w)) }
 
-            @windows.selected=(@splash)
             self.selected=(@windows)
+            @windows.selected=(@splash)
          end
 
          def layout

data/lib/ektoplayer/views/playinginfo.rb

@@ -30,51 +30,42 @@ module Ektoplayer
 
          def length=(l)
             return if @length == l.to_i
-
-            with_lock do
-               @length = l.to_i
-               draw_position_and_length
-            end
+            @length = l.to_i
+            draw_position_and_length
          end
 
          def position=(p)
             return if @position == p.to_i
-
-            with_lock do
-               @position = p.to_i
-               draw_position_and_length
-            end
+            @position = p.to_i
+            draw_position_and_length
          end
 
          def draw_position_and_length
+            return unless visible?
             @win.setpos(0,0)
             @win.with_attr(Theme[:'playinginfo.position']) do
                @win << "[#{Common::to_time(@position)}/#{Common::to_time(@length)}]" 
             end
-            want_refresh
+            @win.refresh
          end
 
          def attach(playlist, player)
-            with_lock do
-               player.events.on(:pause)  { self.paused!  }
-               player.events.on(:stop)   { self.stopped! }
-               player.events.on(:play)   { self.playing! }
-
-               player.events.on(:position_change) do
-                  with_lock do
-                     self.position=(player.position)
-                     self.length=(player.length)
-                  end
-               end
+            player.events.on(:pause)  { self.paused!  }
+            player.events.on(:stop)   { self.stopped! }
+            player.events.on(:play)   { self.playing! }
 
-               playlist.events.on(:current_changed) {
-                  self.track=(playlist[playlist.current_playing])
-               }
+            player.events.on(:position_change) do
+               self.position=(player.position)
+               self.length=(player.length)
+            end
 
-               # TODO: move mouse?
-               self.mouse.on(Curses::BUTTON1_CLICKED) do |mevent|
-                  player.toggle
-               end
+            playlist.events.on(:current_changed) {
+               self.track=(playlist[playlist.current_playing])
+            }
+
+            # TODO: move mouse?
+            self.mouse.on(Curses::BUTTON1_CLICKED) do |mevent|
+               player.toggle
             end
          end
          
@@ -98,10 +89,9 @@ module Ektoplayer
 
          def draw
             @win.erase
+            draw_position_and_length
             
             if @track
-               draw_position_and_length
-
                fill(Config[:'playinginfo.format1']).each_with_index do |fmt,i|
                   @win.center(fmt[:sum]) if i == 0
                   @win.with_attr(UI::Colors.set(nil, *fmt[:curses_attrs])) do
@@ -110,7 +100,7 @@ module Ektoplayer
                end
 
                @win.with_attr(Theme[:'playinginfo.state']) do
-                  @win.from_right("[#{@state}]".size) << "[#{@state}]"
+                  @win.from_right(@state.to_s.size + 2) << "[#{@state}]"
                end
 
                @win.next_line
@@ -124,7 +114,7 @@ module Ektoplayer
             else
                @win.center_string(STOPPED_HEADING)
                @win.with_attr(Theme[:'playinginfo.state']) do
-                  @win.from_right('[stopped]'.size) << '[stopped]'
+                  @win.from_right(9) << '[stopped]'
                end
             end
 

data/lib/ektoplayer/views/progressbar.rb

@@ -32,10 +32,9 @@ module Ektoplayer
 
          def draw
             @win.setpos(0,0)
-
-            @progress_width  ||= 0
-            @progress_char ||= Config[:'progressbar.progress_char']
-            @rest_char     ||= Config[:'progressbar.rest_char']
+            @progress_width ||= 0
+            @progress_char  ||= Config[:'progressbar.progress_char']
+            @rest_char      ||= Config[:'progressbar.rest_char']
 
             @win.with_attr(Theme[:'progressbar.progress']) do
                repeat = (@progress_width - @progress_char.size)

data/lib/ektoplayer/views/volumemeter.rb

@@ -28,18 +28,20 @@ module Ektoplayer
          end
 
          def level=(level)
+            return unless visible?
+
             new_level_width = (1.4 * level * @size.width).to_i.clamp(0, @size.width - 1) rescue 0
             return if @level_width == new_level_width
             load_colors
 
             if new_level_width > @level_width
-               @win.setpos(@win.cury, @level_width)
+               @win.setpos(0, @level_width)
                (@level_width).upto(new_level_width).each do |i|
                   @win.attron(@fade[i])
                   @win << @level_char
                end
             else
-               @win.setpos(@win.cury, new_level_width)
+               @win.setpos(0, new_level_width)
             end
 
             if (repeat = @size.width - @win.curx - 1) > 0
@@ -48,7 +50,7 @@ module Ektoplayer
             end
 
             @level_width = new_level_width 
-            @win.refresh if visible?
+            @win.refresh
          end
 
          def attach(player)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ektoplayer
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Benjamin Abendroth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audite