rumu 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ce3ca00e1302fb06489bdc6cc1bdba2b7ae0b63e7f708cda2bd5f44b703ac7b
-  data.tar.gz: 3863590d73009b330208e26393785958221e8c0bbb278fa69b5c4a98141949d1
+  metadata.gz: caa90367efb46acc18ef760c9c8aaa7b419c76647e5363b298820e75f6470c5e
+  data.tar.gz: 8a2f3f3bf5538bdba349ddfbc87976305bbf5dc0f5c8c2f4804f2a1c24dd0c87
 SHA512:
-  metadata.gz: 9f0cf8ec4200de7b176b1fd1d94f64ecc8ef5ee013e5f1ad05d44770b41637e7ca1eb8339a05621541d2089c2fb7a1dc0e06ab327947c020c0d09f73f0828e72
-  data.tar.gz: b9d3550542d9854ec5ac8cbe003fb2c75c617a10152025ad1bed3c04fc8866cd3a131dd3c3b6763e7a106a3f829a77fcdbc3143d470b7ff9a38bda776dd6deda
+  metadata.gz: c7d7101a7a9d234e418c973b20790291eb719199bea093255c6c5c09da3e11520c5806c293c513caaa574c73edd5c79a29c4aec4f907191146b6c857c3588df0
+  data.tar.gz: d1d6370be84e12e1b693eabb6381ac4e2497a46fd56bd694c5366a2fb5083a4e4e1c09adb706c75a7fc445d9849071f530d8cfe471f4169df3ee41178eb05313

data/bin/rumu

@@ -5,22 +5,19 @@ require 'io/console'
 require 'pathname'
 
 pkg='rumu'
-ver='0.3'
+ver='0.3.1'
 pkgd="#{Dir.home}/.config/#{pkg}"
 
 word=4
 rate=44100
 chan=2
-cycle=0
-
-ff_exe="ffmpeg -hide_banner"
 ff_fmt="-ac #{chan} -ar #{rate} -f f#{word*8}le"
-ff_out="-f pulse default"
 
+cycle=0
 list=[]
 list_i=0
 mode=:load
-toff=''
+ssoff=''
 if ARGV.length==0
   if File.file?("#{pkgd}/list")
     list=File.read("#{pkgd}/list").split("\n")
@@ -41,8 +38,8 @@ end
 prefix=/\A(.*).*(\n\1.*)*\Z/.match(list.join("\n"))[1]
 
 ii,io,ie,it=nil,nil,nil,nil
-oi,oo,oe,ot=Open3.popen3("#{ff_exe} #{ff_fmt} -i - #{ff_out}")
-[oo,oe].each{|x|x.close}
+oi,oo,oe,ot=Open3.popen3("ffmpeg #{ff_fmt} -i - -f pulse default")
+oo.close
 
 pt=Thread.new{
   until :quit == mode
@@ -52,11 +49,12 @@ pt=Thread.new{
     end
     case mode
     when :load #load new track
-      io.close unless !io or io.closed?
-      ii,io,ie,it = Open3.popen3 "#{ff_exe} -i #{Shellwords.escape(list[list_i])} #{ssoff} #{ff_fmt} -"
-      [ii,ie].each{|x|x.close}
+      [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.close
       cycle=0 unless ssoff.length > 0
-      puts
+      ssoff=''
       mode=:play
     when :play
       oi.write(io.read(word*chan*rate))
@@ -66,8 +64,8 @@ pt=Thread.new{
 }
 
 until :quit == mode
-  print "\r#{list[list_i][prefix.length..-1]} [#{cycle/60}:#{"%02d"%(cycle%60)}] [N]ext #{list_i>0?"[P]rev ":""}[Q]uit > "
-  case IO.console.raw{|c|c.read_nonblock(1) rescue ''}
+  print "\r#{cycle/60}:#{"%02d"%(cycle%60)} > "
+  case ch=IO.console.raw{|c|c.read_nonblock(1) rescue ''}
   when 'n'
     list_i+=1
     mode= list_i<list.count ? :load : :quit
@@ -78,8 +76,10 @@ until :quit == mode
     end 
   when 'q'
     mode=:quit
-  else
+  when ''
     sleep rand
+  else
+    print "#{ch} < [N]ext #{list_i>0?"[P]rev ":""}[Q]uit"
   end
 end
 
@@ -89,5 +89,5 @@ if list_i<list.count
   File.write(pkgd+"/pos",list_i.to_s+"\n"+cycle.to_s)
 end
 
-puts "        ]  #{pkg} ✝ v#{ver}  [        "
+puts "\r        ]  #{pkg} ✝ v#{ver}  [        "
 pt.join

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rumu
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Benjamin Cook
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain: []
 date: 2021-03-27 00:00:00.000000000 Z
 dependencies: []
-description: rum 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.
+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.
 email: root@baryon.it
 executables:
 - rumu