rumu 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caa90367efb46acc18ef760c9c8aaa7b419c76647e5363b298820e75f6470c5e
-  data.tar.gz: 8a2f3f3bf5538bdba349ddfbc87976305bbf5dc0f5c8c2f4804f2a1c24dd0c87
+  metadata.gz: a1965b7e8026eb72e0cfd4c9f4b74523adf96c2d64a30508df01283a51f6ef80
+  data.tar.gz: 287bb2634da8ce13cf4d1380ac29561b4f747bafdd8c79b69c05acbdc3910907
 SHA512:
-  metadata.gz: c7d7101a7a9d234e418c973b20790291eb719199bea093255c6c5c09da3e11520c5806c293c513caaa574c73edd5c79a29c4aec4f907191146b6c857c3588df0
-  data.tar.gz: d1d6370be84e12e1b693eabb6381ac4e2497a46fd56bd694c5366a2fb5083a4e4e1c09adb706c75a7fc445d9849071f530d8cfe471f4169df3ee41178eb05313
+  metadata.gz: 2139d62a2b4eac691d693a2092b9fb4721382fe10295f811b6a98d25a7852005567641974e50c52c06f5f3a79ab95d40c5dd678cb26579bd41a40f02b585e909
+  data.tar.gz: 94a7861eebfc123955fa8315ac111fc44b2c85945127d62cfef552bfd733ff4c2f28e448f2bb5690002deb28cfda0c3cc4b41032ec8317974b87a23eae7c592e

data/bin/rumu

@@ -3,26 +3,60 @@ require 'open3'
 require 'shellwords'
 require 'io/console'
 require 'pathname'
+require 'ffi'
+require 'pulseaudio_simple_ffi'
 
 pkg='rumu'
-ver='0.3.1'
-pkgd="#{Dir.home}/.config/#{pkg}"
+ver='0.4.0'
+ConfigDir="#{Dir.home}/.config/#{pkg}"
+Dir.mkdir(ConfigDir) unless File.directory?(ConfigDir)
 
-word=4
-rate=44100
-chan=2
-ff_fmt="-ac #{chan} -ar #{rate} -f f#{word*8}le"
+Channels,Rate,WordSize=2,44100,4
+FfmpegFmt="-ac #{Channels} -ar #{Rate} -f f#{WordSize*8}le"
 
-cycle=0
-list=[]
-list_i=0
-mode=:load
-ssoff=''
+class FfmpegPipeO
+  def initialize(device, channels: Channels, rate: Rate, wordsize: WordSize )
+    device = device.to_s.chomp.length>0 ? device.to_s.chomp : '-f pulse default'
+    @in,@out,@err,@thr = Open3.popen3("ffmpeg -loglevel -8 #{FfmpegFmt} -i - #{device}")
+    @out.close
+    @err.close
+  end
+  def write buf
+    @in.write buf
+  end
+  def close
+    @in.close
+  end
+end
+
+class ConfigO
+  def initialize file: ConfigDir+'/out'
+    @mode=:pulse
+    @device=nil
+    if File.file?(file)
+      cfg=File.read(file).split("\n")
+      @mode=cfg[0].to_sym
+      @device=cfg[1].to_s.chomp.length>0 ? cfg[1] : nil
+    end
+    File.write(file,@mode.to_s+"\n"+@device.to_s)
+    @out= :ffmpeg == @mode ? 
+      FfmpegPipeO.new(@device) : 
+      PulseAudioSimpleFFI::PulseAudioSimpleO.new(@device,'Music Playlist',channels:Channels,rate:Rate)
+  end
+  def write buf
+    @out.write buf
+  end
+  def close
+    @out.close
+  end
+end
+
+list,list_i,cycle,mode,ssoff,help=[],0,0,:load,'',''
 if ARGV.length==0
-  if File.file?("#{pkgd}/list")
-    list=File.read("#{pkgd}/list").split("\n")
-    if File.file?("#{pkgd}/pos")
-      pos=File.read("#{pkgd}/pos").split("\n")
+  if File.file?("#{ConfigDir}/list")
+    list=File.read("#{ConfigDir}/list").split("\n")
+    if File.file?("#{ConfigDir}/pos")
+      pos=File.read("#{ConfigDir}/pos").split("\n")
       list_i=pos[0].to_i
       cycle=pos[1].to_i
       cycle-=3 if cycle>3
@@ -36,10 +70,10 @@ else
   list=ARGV.map{|x|Pathname(x).realpath.to_s}
 end
 prefix=/\A(.*).*(\n\1.*)*\Z/.match(list.join("\n"))[1]
+puts prefix
 
 ii,io,ie,it=nil,nil,nil,nil
-oi,oo,oe,ot=Open3.popen3("ffmpeg #{ff_fmt} -i - -f pulse default")
-oo.close
+oo=ConfigO.new
 
 pt=Thread.new{
   until :quit == mode
@@ -50,44 +84,50 @@ pt=Thread.new{
     case mode
     when :load #load new track
       [io,ie].each{|x|x.close} unless !io or io.closed?
-      ii,io,ie,it = Open3.popen3 "ffmpeg -i #{Shellwords.escape(list[list_i])} #{ssoff} #{ff_fmt} -"
-      puts "\r#{list[list_i][prefix.length..-1]}"
+      ii,io,ie,it = Open3.popen3 "ffmpeg -loglevel -8 -i #{Shellwords.escape(list[list_i])} #{ssoff} #{FfmpegFmt} -"
       ii.close
       cycle=0 unless ssoff.length > 0
+      puts "#{' '*help.length}\r#{list[list_i][prefix.length..-1]}"
       ssoff=''
+      help=''
       mode=:play
     when :play
-      oi.write(io.read(word*chan*rate))
+      oo.write(io.read(Channels*Rate*WordSize))
       cycle+=1
     end
   end
+  oo.close
 }
 
 until :quit == mode
   print "\r#{cycle/60}:#{"%02d"%(cycle%60)} > "
-  case ch=IO.console.raw{|c|c.read_nonblock(1) rescue ''}
+  case ch=IO.console.raw{|c|c.read_nonblock(1) rescue ''}.downcase
   when 'n'
     list_i+=1
     mode= list_i<list.count ? :load : :quit
+  when 'r'
+    mode=:load
   when 'p'
     if list_i>0
       list_i-=1
       mode=:load
     end 
+  when 's'
+    print "Seek to: "
+    ti=(ts=IO.console.readline.chomp).split(':')
+    ssoff="-ss #{ts}"
+    cycle=(ti[-1].to_f + ti[-2].to_f*60 + ti[-3].to_f*60*60).to_i
+    mode=:load
   when 'q'
     mode=:quit
+    File.write(ConfigDir+"/list",list.join("\n"))
+    File.write(ConfigDir+"/pos",list_i.to_s+"\n"+cycle.to_s)
   when ''
     sleep rand
   else
-    print "#{ch} < [N]ext #{list_i>0?"[P]rev ":""}[Q]uit"
+    print (help="#{ch} < #{list_i>0?"[P]rev ":""}[R]estart [S]eek [N]ext [Q]uit")
   end
 end
 
-if list_i<list.count
-  Dir.mkdir(pkgd) unless File.directory?(pkgd)
-  File.write(pkgd+"/list",list.join("\n"))
-  File.write(pkgd+"/pos",list_i.to_s+"\n"+cycle.to_s)
-end
-
-puts "\r        ]  #{pkg} ✝ v#{ver}  [        "
+puts "\r    ]  #{pkg} ✝ v#{ver}  [    "
 pt.join

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rumu
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Benjamin Cook
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-27 00:00:00.000000000 Z
-dependencies: []
+date: 2021-04-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: pulseaudio_simple_ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 description: rumu is an aggressively minimized audio player that plays a playlist
   gaplessly leveraging command-line ffmpeg and pipes. After a quit, it will return
   to where it left off when run next.
@@ -31,7 +45,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -39,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ffmpeg
-rubygems_version: 3.2.13
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: "(ru)by (mu)usic - a minimal ffmpeg-based gapless audio playlist player"