ektoplayer 0.1.6 → 0.1.11

data/lib/ektoplayer/views/mainwindow.rb

@@ -1,11 +1,11 @@
 %w( ../ui/widgets/container playinginfo progressbar
-volumemeter splash playlist browser info help tabbar ).
+splash playlist browser info help tabbar ).
    each {|_|require_relative(_)}
 
 module Ektoplayer
    module Views
       class MainWindow < UI::VerticalContainer
-         attr_reader :progressbar, :volumemeter, :playinginfo, :tabbar
+         attr_reader :progressbar, :playinginfo, :tabbar
          attr_reader :windows, :splash, :playlist, :browser, :info, :help
 
          def initialize(**opts)
@@ -13,7 +13,6 @@ module Ektoplayer
 
             @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)
@@ -37,12 +36,10 @@ module Ektoplayer
             height = @size.height
 
             @playinginfo.size=(@size.update(height: 2))
-            @volumemeter.size=(@size.update(height: 1))
             @progressbar.size=(@size.update(height: 1))
             @tabbar.size=(@size.update(height: 1))
 
             height -= 2 if @playinginfo.visible?
-            height -= 1 if @volumemeter.visible?
             height -= 1 if @progressbar.visible?
             height -= 1 if @tabbar.visible?
 

data/lib/ektoplayer/views/playinginfo.rb

@@ -20,7 +20,7 @@ module Ektoplayer
 
          def stopped!
             return if @state == :stopped
-            with_lock { @state = :stopped; want_redraw }
+            with_lock { @state = :stopped; @position = 0; want_redraw }
          end
 
          def track=(t)
@@ -42,11 +42,9 @@ module Ektoplayer
 
          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
-            @win.refresh
+            @win.attrset(Theme[:'playinginfo.position'])
+            @win.mvaddstr(0, 0, "[#{Common::to_time(@position)}/#{Common::to_time(@length)}]")
+            @win.noutrefresh
          end
 
          def attach(playlist, player)
@@ -64,7 +62,7 @@ module Ektoplayer
             }
 
             # TODO: move mouse?
-            self.mouse.on(Curses::BUTTON1_CLICKED) do |mevent|
+            self.mouse.on(ICurses::BUTTON1_CLICKED) do |mevent|
                player.toggle
             end
          end
@@ -94,31 +92,28 @@ module Ektoplayer
             if @track
                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
-                     @win << fmt[:filled]
-                  end
+                  @win.attrset(UI::Colors.set(nil, *fmt[:curses_attrs]))
+                  @win << fmt[:filled]
                end
 
-               @win.with_attr(Theme[:'playinginfo.state']) do
-                  @win.from_right(@state.to_s.size + 2) << "[#{@state}]"
-               end
+               @win.attrset(Theme[:'playinginfo.state'])
+               @win.from_right(@state.to_s.size + 2) << "[#{@state}]"
 
                @win.next_line
 
                fill(Config[:'playinginfo.format2']).each_with_index do |fmt,i|
                   @win.center(fmt[:sum]) if i == 0
-                  @win.with_attr(UI::Colors.set(nil, *fmt[:curses_attrs])) do
-                     @win << fmt[:filled]
-                  end
+                  @win.attrset(UI::Colors.set(nil, *fmt[:curses_attrs]))
+                  @win << fmt[:filled]
                end
             else
+               @win.attrset(0)
                @win.center_string(STOPPED_HEADING)
-               @win.with_attr(Theme[:'playinginfo.state']) do
-                  @win.from_right(9) << '[stopped]'
-               end
+               @win.attrset(Theme[:'playinginfo.state'])
+               @win.from_right(9) << '[stopped]'
             end
 
-            #@win.next_line.addstr('─' * @size.width)
+            #@win.next_line.addstr('~' * @size.width)
          end
       end
    end

data/lib/ektoplayer/views/progressbar.rb

@@ -5,13 +5,36 @@ require_relative '../theme'
 module Ektoplayer
    module Views
       class ProgressBar < UI::Window
+         def layout
+            super
+            load_colors
+         end
+
+         def load_colors(force=false)
+            return if @fade and not force
+
+            if Theme.current == 256
+               fader = UI::ColorFader.new([25,26,27,32,39,38,44,44,45,51,87,159,195])
+            elsif Theme.current == 8
+               fader = UI::ColorFader.new([:blue])
+            else
+               fader = UI::ColorFader.new([-1])
+            end
+
+            @fade = fader.fade(@size.width)
+            @progress_width = @size.width
+            @progress_char = Config[:'progressbar.progress_char']
+            @rest_char  = Config[:'progressbar.rest_char']
+         end
+
+
          def attach(player)
             player.events.on(:position_change) do
                self.percent_playing = player.position_percent
             end
 
             view=self # TODO
-            [Curses::BUTTON1_CLICKED, Curses::BUTTON2_CLICKED, Curses::BUTTON3_CLICKED].
+            [ICurses::BUTTON1_CLICKED, ICurses::BUTTON2_CLICKED, ICurses::BUTTON3_CLICKED].
                each do |button|
                view.mouse.on(button) do |mevent|
                   pos = Float(mevent.x) / (self.size.width - 1) * player.length rescue player.position
@@ -31,15 +54,12 @@ module Ektoplayer
          end
 
          def draw
-            @win.setpos(0,0)
-            @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)
-               @win << @progress_char[0] * repeat if repeat > 0
-               @win << @progress_char[1..-1] if @progress_width > 0
+            load_colors
+            @win.move(0,0)
+
+            @progress_width.times do |i|
+               @win.attron(@fade[i])
+               @win << @progress_char
             end
 
             @win.attron(Theme[:'progressbar.rest'])

data/lib/ektoplayer/views/splash.rb

@@ -18,35 +18,35 @@ module Ektoplayer
  \  \__   | | |\    | |__         | |     | :___  | |_| | , /____  | |     | |
   \____)  |_| |_|   \___/         |_|     \____/  \_____| |______| |_|     |_|..
                                                        split(?\n)[1..-1].freeze
-         EKTOPLAZM_SIGNATURE = %q;
+         EKTOPLAZM_SIGNATURE = %q{
   ___                   _   _    _ _                  _   _
  / __| ___ _  _ _ _  __| | | |  (_) |__  ___ _ _ __ _| |_(_)___ _ _
  \__ \/ _ \ || | ' \/ _` | | |__| | '_ \/ -_) '_/ _` |  _| / _ \ ' \
- |___/\___/\_,_|_||_\__,_| |____|_|_.__/\___|_| \__,_|\__|_\___/_||_|;.
+ |___/\___/\_,_|_||_\__,_| |____|_|_.__/\___|_| \__,_|\__|_\___/_||_|}.
                                                        split(?\n)[1..-1].freeze
 
          BUBBLES = [
-            UI::Point.new(x: 6,  y: 3).frz, UI::Point.new(x: 6,  y: 7).frz,
-            UI::Point.new(x: 28, y: 1).frz, UI::Point.new(x: 28, y: 9).frz,
-            UI::Point.new(x: 46, y: 7).frz, UI::Point.new(x: 71, y: 9).frz
+            UI::Point.new(x: 6,  y: 3).freeze, UI::Point.new(x: 6,  y: 7).freeze,
+            UI::Point.new(x: 28, y: 1).freeze, UI::Point.new(x: 28, y: 9).freeze,
+            UI::Point.new(x: 46, y: 7).freeze, UI::Point.new(x: 71, y: 9).freeze
          ].freeze
 
          def load_colors
-            @signature_fade = @ekto_logo_fade = @bubble_fade = [-1].freeze
+            signature_fade = ekto_logo_fade = bubble_fade = [-1].freeze
 
             if Theme.current == 256
-               @bubble_fade    = [161,162,167,168]
-               @signature_fade = [99, 105, 111, 117]
-               @ekto_logo_fade = [23, 23, 29, 36, 42, 48, 42, 36, 29, 23]
+               bubble_fade    = [168,167,161,161,161].freeze
+               signature_fade = [99, 105, 111, 117].freeze
+               ekto_logo_fade = [23, 23, 29, 36, 42, 48, 42, 36, 29, 23].freeze
             elsif Theme.current == 8
-               @bubble_fade    = [:red]
-               @ekto_logo_fade = [:blue]
-               @signature_fade = [:magenta]
+               bubble_fade    = [:red].freeze
+               ekto_logo_fade = [:blue].freeze
+               signature_fade = [:magenta].freeze
             end
 
-            @bubble_fade    = UI::ColorFader.new(@bubble_fade)
-            @signature_fade = UI::ColorFader.new(@signature_fade)
-            @ekto_logo_fade = UI::ColorFader.new(@ekto_logo_fade)
+            @bubble_fade    = UI::ColorFader.new(bubble_fade)
+            @signature_fade = UI::ColorFader.new(signature_fade)
+            @ekto_logo_fade = UI::ColorFader.new(ekto_logo_fade)
          end
 
          def draw
@@ -68,18 +68,16 @@ module Ektoplayer
             end
 
             @ekto_logo_fade.fade(EKTOPLAZM_LOGO.size).each_with_index do |c,i|
-               @win.with_attr(c) do
-                  @win.setpos(top_pad + i, left_pad)
-                  @win << EKTOPLAZM_LOGO[i]
-               end
+               @win.attrset(c)
+               @win.mvaddstr(top_pad + i, left_pad, EKTOPLAZM_LOGO[i])
             end
 
             f = @bubble_fade.fade(EKTOPLAZM_LOGO.size)
             BUBBLES.each do |p|
-               @win.setpos(top_pad + p.y - 1, left_pad + p.x + 1)
-               @win.attron(f[p.y - 1]) { @win.addch(?_) }
-               @win.setpos(top_pad + p.y, left_pad + p.x)
-               @win.attron(f[p.y]) { @win << '(_)' } 
+               @win.attrset(f[p.y - 1])
+               @win.mvaddstr(top_pad + p.y - 1, left_pad + p.x + 1, ?_)
+               @win.attrset(f[p.y])
+               @win.mvaddstr(top_pad + p.y, left_pad + p.x, '(_)')
             end
 
             return unless draw_signature
@@ -88,9 +86,10 @@ module Ektoplayer
             left_pad = w_center - (EKTOPLAZM_SIGNATURE.max.size / 2)
 
             EKTOPLAZM_SIGNATURE.each_with_index do |line, i|
-               @win.setpos(top_pad + i, left_pad)
+               @win.move(top_pad + i, left_pad)
                @signature_fade.fade2(line.size).each_with_index do |color,y|
-                  @win.with_attr(color) { @win << line[y] }
+                  @win.attrset(color)
+                  @win.addstr(line[y])
                end
             end
          end

data/lib/ektoplayer/views/tabbar.rb

@@ -31,19 +31,20 @@ module Ektoplayer
             self.pad_size=(@size.update(height: 1))
             mouse_section.clear
             @win.erase
-            @win.setpos(0,0)
+            @win.move(0,0)
 
             @tabs.each_with_index do |title, i|
                mevent = with_mouse_section_event do
                   if i == @selected
-                     @win.with_attr(Theme[:'tabbar.selected']) { @win << title.to_s }
+                     @win.attrset(Theme[:'tabbar.selected'])
                   else
-                     @win.with_attr(Theme[:'tabbar.unselected']) { @win << title.to_s }
+                     @win.attrset(Theme[:'tabbar.unselected'])
                   end
 
-                  @win.addch(' ')
+                  @win << title.to_s
+                  @win.addch(32) # ' '
                end
-               mevent.on(Curses::BUTTON1_CLICKED) do
+               mevent.on(ICurses::BUTTON1_CLICKED) do
                   trigger(@events, :tab_clicked, i)
                end
             end

data/lib/ektoplayer/views/trackrenderer.rb

@@ -90,31 +90,38 @@ module Ektoplayer
             end
          end
 
-         def render(scr, item, index, selected: false, marked: false)
+         def render(scr, item, index, selected: false, marked: false, selection: false)
             fail ArgumentError, 'item is nil' unless item
             return unless @column_format
 
             additional_attributes = 0
-            additional_attributes |= Curses::A_BOLD     if marked
-            additional_attributes |= Curses::A_STANDOUT if selected
+            additional_attributes |= ICurses::A_BOLD     if marked
+            additional_attributes |= ICurses::A_STANDOUT if selected
 
             if item.is_a? String or item.is_a? Symbol
-               if index % 2 == 0
+               if selection
+                  color = Theme[:'list.item_selection']
+               elsif index % 2 == 0
                   color = Theme[:'list.item_even']
                else
                   color = Theme[:'list.item_odd']
                end
 
-               scr.with_attr(color | additional_attributes) do
-                  scr << "[#{item}]".ljust(@width)
-               end
+               scr.attrset(color | additional_attributes)
+               scr.addstr("[#{item}]".ljust(@width))
                return
             end
 
             @column_format.each_with_index do |c,i|
-               scr.with_attr(c[:curses_codes] | additional_attributes) do
-                  value = (item[c[:tag]] or '')
+               scr.addch(32) if i > 0
+
+               if selection
+                  scr.attrset(Theme[:'list.item_selection'] | additional_attributes)
+               else
+                  scr.attrset(c[:curses_codes] | additional_attributes)
+               end
 
+               if value = item[c[:tag]]
                   if value.is_a?(Integer)
                      value = "%.2d" % value
                   else
@@ -122,13 +129,12 @@ module Ektoplayer
                   end
 
                   if c[:justify] == :right
-                     value = value.rjust(c[:render_size])
+                     scr.addstr(value.rjust(c[:render_size]))
                   else
-                     value = value.ljust(c[:render_size])
+                     scr.addstr(value.ljust(c[:render_size]))
                   end
-
-                  scr.addstr(value)
-                  scr.addstr(' ') if i < (@column_format.size - 1)
+               else
+                  scr.addstr(' ' * c[:render_size])
                end
             end
          end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ektoplayer
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.11
 platform: ruby
 authors:
 - Benjamin Abendroth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-03-25 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: audite
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: curses
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 description: Ektoplayer is a commandline client for http://ektoplazm.com, a website
   providing free electronic music such as techno, goa and psy-trance
 email: braph93@gmx.de
@@ -107,6 +65,13 @@ files:
 - lib/ektoplayer/controllers/playlist.rb
 - lib/ektoplayer/database.rb
 - lib/ektoplayer/events.rb
+- lib/ektoplayer/icurses.rb
+- lib/ektoplayer/icurses/curses.rb
+- lib/ektoplayer/icurses/ffi_ncurses.rb
+- lib/ektoplayer/icurses/ncurses.rb
+- lib/ektoplayer/icurses/ncursesw.rb
+- lib/ektoplayer/icurses/sugar.rb
+- lib/ektoplayer/icurses/test.rb
 - lib/ektoplayer/models/browser.rb
 - lib/ektoplayer/models/database.rb
 - lib/ektoplayer/models/model.rb
@@ -114,11 +79,12 @@ files:
 - lib/ektoplayer/models/playlist.rb
 - lib/ektoplayer/models/search.rb
 - lib/ektoplayer/models/trackloader.rb
-- lib/ektoplayer/mp3player.rb
 - lib/ektoplayer/operations/browser.rb
 - lib/ektoplayer/operations/operations.rb
 - lib/ektoplayer/operations/player.rb
 - lib/ektoplayer/operations/playlist.rb
+- lib/ektoplayer/players/mpg_portaudio_player.rb
+- lib/ektoplayer/players/mpg_wrapper_player.rb
 - lib/ektoplayer/theme.rb
 - lib/ektoplayer/trackloader.rb
 - lib/ektoplayer/ui.rb
@@ -138,7 +104,6 @@ files:
 - lib/ektoplayer/views/splash.rb
 - lib/ektoplayer/views/tabbar.rb
 - lib/ektoplayer/views/trackrenderer.rb
-- lib/ektoplayer/views/volumemeter.rb
 homepage: http://github.com/braph/ektoplayer
 licenses:
 - GPL-3.0
@@ -157,7 +122,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- 'For playback: /bin/mpg123 or the "audite-lib" RubyGem'
+- 'For archive extracting: /bin/unzip, /bin/7z or "rubyzip" RubyGem'
+- 'One of the following curses-gems: ffi-ncurses, curses'
 rubyforge_project: 
 rubygems_version: 2.6.8
 signing_key: