rumu 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d06d25705c6b4da13ff00b1825e53739188fd5e2412c3135d0ce4a6586d4a7cb
-  data.tar.gz: 31c076843b5894506d1e706277309933ed13e2e70f9c9170225f5ddec58269ba
+  metadata.gz: a1965b7e8026eb72e0cfd4c9f4b74523adf96c2d64a30508df01283a51f6ef80
+  data.tar.gz: 287bb2634da8ce13cf4d1380ac29561b4f747bafdd8c79b69c05acbdc3910907
 SHA512:
-  metadata.gz: fdcda38fa11055f5edea07c3bb83dad0a518ba6c97add5f281413b650451ed84c73e1354ed48248ab0d6a2837649a16aa94892b0a7b80d4da342a4ec183a8cc2
-  data.tar.gz: 6345879a1a65267e661cd755d1241d40c1f8ef297a6e8505ec675d14847cb3ab72ac761c1cb232487225bf2500f8ccfd93555b60fe0c11b6cdea45cf8761c6ca
+  metadata.gz: 2139d62a2b4eac691d693a2092b9fb4721382fe10295f811b6a98d25a7852005567641974e50c52c06f5f3a79ab95d40c5dd678cb26579bd41a40f02b585e909
+  data.tar.gz: 94a7861eebfc123955fa8315ac111fc44b2c85945127d62cfef552bfd733ff4c2f28e448f2bb5690002deb28cfda0c3cc4b41032ec8317974b87a23eae7c592e

data/bin/rumu

@@ -3,24 +3,60 @@ require 'open3'
 require 'shellwords'
 require 'io/console'
 require 'pathname'
+require 'ffi'
+require 'pulseaudio_simple_ffi'
 
 pkg='rumu'
-ver='0.3.5'
-pkgd="#{Dir.home}/.config/#{pkg}"
+ver='0.4.0'
+ConfigDir="#{Dir.home}/.config/#{pkg}"
+Dir.mkdir(ConfigDir) unless File.directory?(ConfigDir)
 
-chan,rate,word=2,44100,4
-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"
 
-Dir.mkdir(pkgd) unless File.directory?(pkgd)
-File.write(pkgd+"/dev","-f pulse default") unless File.file?("#{pkgd}/dev")
-ff_out=File.read(pkgd+"/dev")
+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
@@ -37,8 +73,7 @@ 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 -loglevel -8 #{ff_fmt} -i - #{ff_out}")
-oo.close
+oo=ConfigO.new
 
 pt=Thread.new{
   until :quit == mode
@@ -49,7 +84,7 @@ 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 -loglevel -8 -i #{Shellwords.escape(list[list_i])} #{ssoff} #{ff_fmt} -"
+      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]}"
@@ -57,11 +92,11 @@ pt=Thread.new{
       help=''
       mode=:play
     when :play
-      oi.write(io.read(word*chan*rate))
+      oo.write(io.read(Channels*Rate*WordSize))
       cycle+=1
     end
   end
-  [oi,oe].each{|x|x.close}
+  oo.close
 }
 
 until :quit == mode
@@ -85,8 +120,8 @@ until :quit == mode
     mode=:load
   when 'q'
     mode=:quit
-    File.write(pkgd+"/list",list.join("\n"))
-    File.write(pkgd+"/pos",list_i.to_s+"\n"+cycle.to_s)
+    File.write(ConfigDir+"/list",list.join("\n"))
+    File.write(ConfigDir+"/pos",list_i.to_s+"\n"+cycle.to_s)
   when ''
     sleep rand
   else

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rumu
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Benjamin Cook
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-30 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"