multimedia_paradise 1.1.344 → 1.2.2

data/lib/multimedia_paradise/audio/streamripper/streamripper_wrapper.rb

@@ -8,9 +8,9 @@
 # and shoutcast things.
 # =========================================================================== #
 # require 'multimedia_paradise/audio/streamripper/streamripper_wrapper.rb'
+# MultimediaParadise.streamripper
 # =========================================================================== #
 require 'multimedia_paradise/base/base.rb'
-require 'multimedia_paradise/audio/streamripper/constants.rb'
 
 module MultimediaParadise
 
@@ -18,6 +18,8 @@ module Audio
 
 class StreamripperWrapper < ::MultimediaParadise::Base
 
+  require 'multimedia_paradise/audio/streamripper/constants.rb'
+
   # ========================================================================= #
   # === initialize
   # ========================================================================= #
@@ -45,7 +47,7 @@ class StreamripperWrapper < ::MultimediaParadise::Base
     @can_we_exit = true
     @use_this_url = HOUSE_MUSIC # URL_2 # This is the default.
     @run_in_simulation_mode = false # If true then we just simulate what we would do.
-    @be_verbose = false    
+    @be_verbose = false
   end
 
   # ========================================================================= #
@@ -134,7 +136,7 @@ class StreamripperWrapper < ::MultimediaParadise::Base
   # Feedback the project url here.
   # ========================================================================= #
   def url?
-    e 'http://sourceforge.net/project/showfiles.php?group_id=6172'
+    e 'https://sourceforge.net/project/showfiles.php?group_id=6172'
   end
 
   # ========================================================================= #
@@ -191,7 +193,7 @@ class StreamripperWrapper < ::MultimediaParadise::Base
   # Provide to us a colourized variant.
   # ========================================================================= #
   def dir?
-    sdir((Dir.pwd+'/').squeeze('/'))
+    sdir(return_pwd)
   end
 
   # ========================================================================= #
@@ -266,7 +268,7 @@ end; end
 # =========================================================================== #
 # === MultimediaParadise.streamripper
 # =========================================================================== #
-def self.streamripper(i = nil)
+def self.streamripper(i = ARGV)
   MultimediaParadise::Audio::StreamripperWrapper.new(i)
 end
 

data/lib/multimedia_paradise/audio/to_mp3.rb

@@ -8,6 +8,7 @@
 # assumed to be an audio-file.
 # =========================================================================== #
 # require 'multimedia_paradise/audio/to_mp3.rb'
+# MultimediaParadise.to_mp3
 # =========================================================================== #
 require 'multimedia_paradise/audio/base.rb'
 
@@ -72,7 +73,7 @@ class ToMp3 < MultimediaParadise::AudioBase # === MultimediaParadise::Audio::ToM
   # === menu                                                       (menu tag)
   # ========================================================================= #
   def menu(
-      i = @commandline_arguments
+      i = commandline_arguments?
     )
     if i.is_a? Array
       i.flatten.each {|entry| menu(entry) }
@@ -104,7 +105,7 @@ class ToMp3 < MultimediaParadise::AudioBase # === MultimediaParadise::Audio::ToM
       _ = 'ffmpeg -i '+this_file+
           ' -vn -ar 44100 -ac 2 -ab '+BITRATE_TO_USE+' -f mp3 '+
           output_filename
-      e "The output file will be called: #{sfile(output_filename)}"
+      e "#{rev}The output file will be called: #{sfile(output_filename)}"
       e
       esystem _, colour: :royalblue # <- Pass the command into this system()-variant.
       e
@@ -113,7 +114,7 @@ class ToMp3 < MultimediaParadise::AudioBase # === MultimediaParadise::Audio::ToM
   end
 
   # ========================================================================= #
-  # === run
+  # === run                                                         (run tag)
   # ========================================================================= #
   def run
     menu
@@ -129,8 +130,9 @@ end; end
 # =========================================================================== #
 def self.to_mp3(*i)
   MultimediaParadise::Audio::ToMp3.new(i)
-end
-
+end; self.instance_eval { alias ogg_to_mp3 to_mp3 } # === MultimediaParadise.ogg_to_mp3
+     self.instance_eval { alias mp4_to_mp3 to_mp3 } # === MultimediaParadise.mp4_to_mp3
+  
 end
 
 if __FILE__ == $PROGRAM_NAME

data/lib/multimedia_paradise/audio/to_ogg.rb

@@ -7,7 +7,9 @@
 # Convert an audio file into .ogg format.
 #
 # Usage example:
+#
 #   MultimediaParadise::ToOgg.new
+#
 # =========================================================================== #
 # require 'multimedia_paradise/audio/to_ogg.rb'
 # =========================================================================== #
@@ -79,7 +81,7 @@ class ToOgg < ::MultimediaParadise::AudioBase # === MultimediaParadise::ToOgg
   # === report_that_we_are_done_now
   # ========================================================================= #
   def report_that_we_are_done_now
-    e "Finished creating the file #{sfile(output_file?)}"
+    e "#{rev}Finished creating the file #{sfile(output_file?)}#{rev}."
   end
 
   # ========================================================================= #

data/lib/multimedia_paradise/audio/wav_to_mp3.rb

@@ -20,7 +20,7 @@ module Audio
 
 class WavToMp3 # === MultimediaParadise::Audio::WavToMp3
 
-  require 'multimedia_paradise/conversions/conversions.rb'
+  require 'multimedia_paradise/toplevel_methods/conversions.rb'
 
   # ========================================================================= #
   # === initialize
@@ -59,20 +59,20 @@ class WavToMp3 # === MultimediaParadise::Audio::WavToMp3
   # === input_file_without_extension?
   # ========================================================================= #
   def input_file_without_extension?
-    input?.gsub(/#{File.extname(input?)}/, '')
+    input?.delete_suffix(File.extname(input?))
   end
 
   # ========================================================================= #
   # === output?
   # ========================================================================= #
   def output?
-    'output_'+input_file_without_extension?+'.mp3'
+    "output_#{input_file_without_extension?}.mp3"
   end; alias output_file? output? # === output_file?
 
   # ========================================================================= #
-  # === run
+  # === run                                                         (run tag)
   # ========================================================================= #
-  def run # (run tag)
+  def run
     result = MultimediaParadise.wav_to_mp3(
       input?,
       output: output_file?