rumu 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4eb3a0747c545c987b03ae0bd8117cfb613f5b30ee9ced1e80105b7dd8f9ef1
-  data.tar.gz: 06a8c5ca36e3003a558f0336220f09e3fc6451d234ba10d9a233a6e010920733
+  metadata.gz: c513bd3c485e3d4e1e4cd93bd78fd8697f681e06f4b02f621074381b2e3adc74
+  data.tar.gz: 31d65a7899a76517cf5259268835f41b5cf21ff49ab7f22173014e0c303c90de
 SHA512:
-  metadata.gz: dec6313820cd82b3c62b3be05678d57dc5ba514e212e0962f3186bd010c431b7e251ea19989f8efe64050214f2c1442b4d9893476b6ce7d740286df19ff9e688
-  data.tar.gz: 6c59f26842bf443479e56ddf020d3410cdfa8a90262f5b1ecbd15d04bceffe334b657b92981189c13b70293b148b2aa28b7a2566fa0311a089496811e2fd1da6
+  metadata.gz: 9f54f7c90953189088f948baa1e7cd1a3e93bdecd93ff0a2fcc367e39a3ce1b15a52992688615ea239739b7ca9f201cea20b2b3269c18d07c80c50cb78dd1704
+  data.tar.gz: ceab4d9aabb925ae942c17153a20da8568a87ce3dd98a089525f813718338894ca3dbfe4775143d541e03d96119e1c36e3868381bee1f13654762246f692fa25

data/bin/rumu

@@ -3,53 +3,46 @@ require 'open3'
 require 'shellwords'
 require 'io/console'
 require 'pathname'
-require 'pulseaudio_simple_ffi'
+require 'pulseaudio_simple_fiddle'
 
-Pkg='rumu'
-Ver='0.4.1'
+Pkg,Ver='rumu','0.4.2'
 ConfigDir="#{Dir.home}/.config/#{Pkg}"
 Dir.mkdir(ConfigDir) unless File.directory?(ConfigDir)
 
 Channels,Rate,WordSize=2,44100,4
 FfmpegFmt="-ac #{Channels} -ar #{Rate} -f f#{WordSize*8}le"
 
-class FfmpegPipeO
+class BasicO
+	def write(buf) = buf == nil ? buf : @dev.write(buf)
+	def close = @dev.close
+end
+
+class FfmpegPipeO < BasicO
 	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}")
+		@dev,@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
+class ConfigO < BasicO
 	def initialize file: ConfigDir+'/out'
-		@mode=:pulse
-		@device=nil
+		@mode,@devname=:pulse,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
+			@devname=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(Pkg,'Music Playlist',channels:Channels,rate:Rate,device:@device)
-	end
-	def write buf
-		@out.write buf
-	end
-	def close
-		@out.close
+		File.write(file,@mode.to_s+"\n"+@devname.to_s)
+		@dev= :ffmpeg == @mode ? 
+			FfmpegPipeO.new(@devname) : 
+			PulseAudio::SimpleO.new(Pkg,'Music Playlist',channels:Channels,rate:Rate,device:@devname)
 	end
 end
 
+def print_brand = print "\r    ]  #{Pkg} ✝ v#{Ver}  [    "
+
 list,list_i,cycle,mode,ssoff,help=[],0,0,:load,'',''
 if ARGV.length==0
 	if File.file?("#{ConfigDir}/list")
@@ -66,17 +59,16 @@ if ARGV.length==0
 		exit 1
 	end
 else
-	list=ARGV.map{|x|Pathname(x).realpath.to_s}
+	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
 oo=ConfigO.new
-
 bq=SizedQueue.new 4
 
 iit=Thread.new {
+	io,ie=nil,nil
 	until :quit == mode
 		if io and io.eof?
 			list_i+=1
@@ -87,10 +79,8 @@ iit=Thread.new {
 			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
+                        puts "#{' '*help.length}\r#{list[list_i][prefix.length..-1]}" unless list[list_i].length == prefix.length
+			ssoff,help,mode='','',:play
 		end
 		bq.push io.read(Channels*Rate*WordSize)
 	end
@@ -98,8 +88,8 @@ iit=Thread.new {
 }
 
 oot=Thread.new{
-	until :quit == mode
-		if :play == mode
+	until ( :quit == mode )
+		if ! bq.empty?
 			oo.write bq.pop
 			cycle+=1
 		else
@@ -123,22 +113,23 @@ until :quit == mode
 			mode=:load
 		end 
 	when 's'
-		print "Seek to: "
+		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)
+		File.write(ConfigDir+'/list',list.join("\n"))
+		File.write(ConfigDir+'/pos',list_i.to_s+"\n"+cycle.to_s)
+		print_brand
 	when ''
 		sleep rand
 	else
 		print (help="#{ch} < #{list_i>0?"[P]rev ":""}[R]estart [S]eek [N]ext [Q]uit")
 	end
 end
-
-puts "\r    ]  #{Pkg} ✝ v#{Ver}  [    "
-iit.join
 oot.join
+print_brand
+puts
+

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: rumu
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Benjamin Cook
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-13 00:00:00.000000000 Z
+date: 2024-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pulseaudio_simple_ffi
+  name: pulseaudio_simple_fiddle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -19,7 +19,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.0
 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.
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ffmpeg
-rubygems_version: 3.2.15
+rubygems_version: 3.3.15
 signing_key:
 specification_version: 4
 summary: "(ru)by (mu)usic - a minimal ffmpeg-based gapless audio playlist player"