MusicMaster 0.0.1.20101110 → 1.0.0.20120307

data/AUTHORS

@@ -1 +1,4 @@
-= Muriel Salvan (murielsalvan@users.sourceforge.net)
+= Muriel Salvan (muriel@x-aeon.com)
+
+* 0.0.1.20101110
+* 1.0.0.20120307

data/ChangeLog

@@ -1,5 +1,33 @@
 = MusicMaster Release History
 
+== 1.0.0.20120307 (Beta)
+
+* No more global variable to store the configuration.
+* Moved SSRC configuration parameter to Wave format section only.
+* Removed obsolete configuration parameters.
+* Harmonized configuration parameters.
+* Added directories in MusicMaster configuration file.
+* Corrected record.conf.rb.example.
+* CutFirstSignal: Added the SilenceMin parameter.
+* Major rewriting, using Rake's mechanism.
+* Added complete regression testing.
+* Adapted release info to last version of RubyPackager.
+* Added tests in the release info.
+* Updated release info to new binaries.
+* Updated email address of Muriel Salvan.
+* Adapted comments to match a better RDoc syntax.
+* Adapted to new version of rUtilAnts.
+* Moved obsolete executables and libraries in old/ directories (to be ported and deleted later).
+* Don't apply volume corrections when useless.
+* Implemented a way to specify which Wave files are to be mixed, with volume correction and offset (see https://sourceforge.net/tracker/?func=detail&aid=3411403&group_id=356734&atid=1489604).
+* Temporary file names now use an MD5 hash to avoid conflicts with reused Wave files.
+* Changed examples for Wave files.
+* Migrated TODO list to Trackers.
+* Updated copyright information.
+* Migrated to GIT repository.
+* Cut: Added cut processing.
+* Bug correction: Compressor: Could not specify floating Ratios and Thresholds.
+
 == 0.0.1.20101110 (Alpha)
 
 * Initial public release.

data/LICENSE

@@ -6,7 +6,7 @@ This list is found in the file named AUTHORS.
 The AUTHORS and LICENSE files have to be included in any release of software
 embedding source code of this package, or using it as a derivative software.
 
-Copyright (c) 2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
+Copyright (c) 2010 - 2012 Muriel Salvan (muriel@x-aeon.com)
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

data/README

@@ -1,6 +1,3 @@
--- This file is best viewed when processed by rdoc.
-++
-
 = Music Master
 
 Command-line utility handling Mixing, Mastering and Delivering processes of music projects.
@@ -11,8 +8,8 @@ Check the website at http://musicmaster.sourceforge.net
 
 == Who wrote it ?
 
-Check the AUTHORS[link:files/AUTHORS.html] file.
+Check the AUTHORS[link:AUTHORS.html] file.
 
 == What is the license ?
 
-You can find out in the LICENSE[link:files/LICENSE.html] file.
+You can find out in the LICENSE[link:LICENSE.html] file.

data/ReleaseInfo

@@ -1,8 +1,8 @@
-
-# This file has been generated by RubyPackager during a delivery.
-# More info about RubyPackager: http://rubypackager.sourceforge.net
-{
-  :Version => '0.0.1.20101110',
-  :Tags => [ 'Alpha' ],
-  :DevStatus => 'Alpha'
-}
+
+# This file has been generated by RubyPackager during a delivery.
+# More info about RubyPackager: http://rubypackager.sourceforge.net
+{
+  :version => '1.0.0.20120307',
+  :tags => [ 'Beta' ],
+  :dev_status => 'Beta'
+}

data/bin/Calibrate.rb

@@ -0,0 +1,55 @@
+#!env ruby
+#--
+# Copyright (c) 2009 - 2012 Muriel Salvan (muriel@x-aeon.com)
+# Licensed under the terms specified in LICENSE file. No warranty is provided.
+#++
+
+require 'MusicMaster/Launcher'
+
+module MusicMaster
+
+  class Calibrate < Launcher
+
+    protected
+
+    # Give additional command line options banner
+    #
+    # Return::
+    # * _String_: Options banner
+    def getOptionsBanner
+      return ''
+    end
+
+    # Complete options with the specific ones of this binary
+    #
+    # Parameters::
+    # * *ioOptionParser* (_OptionParser_): The options parser to complete
+    def completeOptionParser(ioOptionParser)
+    end
+
+    # Check configuration.
+    #
+    # Parameters::
+    # * *iConf* (<em>map<Symbol,Object></em>): The configuration
+    # Return::
+    # * _Exception_: Error, or nil in case of success
+    def checkConf(iConf)
+      return nil
+    end
+
+    # Initialize Rake processes and return the task to be built
+    #
+    # Return::
+    # * _Symbol_: Rake target to execute
+    def getRakeTarget
+      initialize_RakeProcesses
+      generateRakeFor_CalibrateRecordings
+
+      return :CalibrateRecordings
+    end
+
+  end
+
+end
+
+exit MusicMaster::Calibrate.new.execute(ARGV)

data/bin/Clean.rb

@@ -0,0 +1,55 @@
+#!env ruby
+#--
+# Copyright (c) 2009 - 2012 Muriel Salvan (muriel@x-aeon.com)
+# Licensed under the terms specified in LICENSE file. No warranty is provided.
+#++
+
+require 'MusicMaster/Launcher'
+
+module MusicMaster
+
+  class Clean < Launcher
+
+    protected
+
+    # Give additional command line options banner
+    #
+    # Return::
+    # * _String_: Options banner
+    def getOptionsBanner
+      return ''
+    end
+
+    # Complete options with the specific ones of this binary
+    #
+    # Parameters::
+    # * *ioOptionParser* (_OptionParser_): The options parser to complete
+    def completeOptionParser(ioOptionParser)
+    end
+
+    # Check configuration.
+    #
+    # Parameters::
+    # * *iConf* (<em>map<Symbol,Object></em>): The configuration
+    # Return::
+    # * _Exception_: Error, or nil in case of success
+    def checkConf(iConf)
+      return nil
+    end
+
+    # Initialize Rake processes and return the task to be built
+    #
+    # Return::
+    # * _Symbol_: Rake target to execute
+    def getRakeTarget
+      initialize_RakeProcesses
+      generateRakeFor_CleanRecordings
+
+      return :CleanRecordings
+    end
+
+  end
+
+end
+
+exit MusicMaster::Clean.new.execute(ARGV)

data/bin/DBConvert.rb

@@ -1,9 +1,10 @@
 #!env ruby
 #--
-# Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
+# Copyright (c) 2009 - 2012 Muriel Salvan (muriel@x-aeon.com)
 # Licensed under the terms specified in LICENSE file. No warranty is provided.
 #++
 
+# Convert a ratio value into a decibel value
 def val2db(iRatio)
   if (iRatio == 0)
     return -1.0/0
@@ -12,6 +13,7 @@ def val2db(iRatio)
   end
 end
 
+# Convert a decibel value into a ratio value
 def db2val(iDB)
   return 2**(iDB/6)
 end

data/bin/Deliver.rb

@@ -1,42 +1,73 @@
-#!env ruby
-#--
-# Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
-# Licensed under the terms specified in LICENSE file. No warranty is provided.
-#++
-
-require 'MusicMaster/Common'
-require 'rUtilAnts/Logging'
-RUtilAnts::Logging::initializeLogging('', '')
-require 'MusicMaster/ConfLoader'
-
-module MusicMaster
-
-  # Execute the delivery
-  #
-  # Parameters:
-  # * *iWaveFile* (_String_): Wave file to deliver
-  def self.execute(iWaveFile)
-    lRealBaseName = File.basename(iWaveFile)[0..-5]
-    MusicMaster::src(iWaveFile, "#{$MusicMasterConf[:Deliver][:Dir]}/#{lRealBaseName}_96_24.wav", :SampleRate => 96000)
-    MusicMaster::src(iWaveFile, "#{$MusicMasterConf[:Deliver][:Dir]}/#{lRealBaseName}_48_24.wav", :SampleRate => 48000)
-    MusicMaster::src(iWaveFile, "#{$MusicMasterConf[:Deliver][:Dir]}/#{lRealBaseName}_44_16.wav", :SampleRate => 44100, :BitDepth => 16, :Dither => true)
-    # TODO: Deliver MP3 files too
-  end
-
-end
-
-rErrorCode = 0
-lWaveFile = ARGV[0]
-if (lWaveFile == nil)
-  logErr 'Please specify the WAVE file.'
-  rErrorCode = 1
-elsif (!File.exists?(lWaveFile))
-  logErr "File #{lWaveFile} does not exist."
-  rErrorCode = 2
-else
-  FileUtils::mkdir_p($MusicMasterConf[:Deliver][:Dir])
-  MusicMaster::execute(lWaveFile)
-  logInfo "===== Delivery finished in #{$MusicMasterConf[:Deliver][:Dir]}"
-end
-
-exit rErrorCode
+#!env ruby
+#--
+# Copyright (c) 2009 - 2012 Muriel Salvan (muriel@x-aeon.com)
+# Licensed under the terms specified in LICENSE file. No warranty is provided.
+#++
+
+require 'MusicMaster/Launcher'
+
+module MusicMaster
+
+  class Deliver < Launcher
+
+    protected
+
+    # Give additional command line options banner
+    #
+    # Return::
+    # * _String_: Options banner
+    def getOptionsBanner
+      return '[--name <DeliverableName>]*'
+    end
+
+    # Complete options with the specific ones of this binary
+    #
+    # Parameters::
+    # * *ioOptionParser* (_OptionParser_): The options parser to complete
+    def completeOptionParser(ioOptionParser)
+      @LstDeliverableNames = []
+      ioOptionParser.on( '--name <DeliverableName>', String,
+        'Specify the name of the deliverable to produce. Can be used several times. If not specified, all deliverables will be produced.') do |iArg|
+        @LstDeliverableNames << iArg
+      end
+    end
+
+    # Check configuration.
+    #
+    # Parameters::
+    # * *iConf* (<em>map<Symbol,Object></em>): The configuration
+    # Return::
+    # * _Exception_: Error, or nil in case of success
+    def checkConf(iConf)
+      rError = nil
+
+      # Check that all formats referenced correspond to a given format
+      if ((iConf[:Deliver] != nil) and
+          (iConf[:Deliver][:Deliverables] != nil))
+        iConf[:Deliver][:Deliverables].each do |iDeliverableName, iDeliverableConf|
+          if (iDeliverableConf[:Format] != nil)
+            raise "Unknown format #{iDeliverableConf[:Format]} needed to deliver #{iDeliverableName}" if (iConf[:Deliver][:Formats][iDeliverableConf[:Format]] == nil)
+          end
+          raise "No mix specified for deliverable #{iDeliverableName}" if (iDeliverableConf[:Mix] == nil)
+        end
+      end
+
+      return rError
+    end
+
+    # Initialize Rake processes and return the task to be built
+    #
+    # Return::
+    # * _Symbol_: Rake target to execute
+    def getRakeTarget
+      initialize_RakeProcesses(:LstDeliverableNames => @LstDeliverableNames)
+      generateRakeFor_Deliver
+
+      return :Deliver
+    end
+
+  end
+
+end
+
+exit MusicMaster::Deliver.new.execute(ARGV)

data/bin/Mix.rb

@@ -1,99 +1,60 @@
 #!env ruby
 #--
-# Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
+# Copyright (c) 2009 - 2012 Muriel Salvan (muriel@x-aeon.com)
 # Licensed under the terms specified in LICENSE file. No warranty is provided.
 #++
 
-require 'MusicMaster/Common'
-require 'rUtilAnts/Logging'
-RUtilAnts::Logging::initializeLogging('', '')
-require 'MusicMaster/ConfLoader'
+require 'MusicMaster/Launcher'
 
 module MusicMaster
 
-  # Execute the Mix
-  #
-  # Parameters:
-  # * *iConfig* (<em>map<Symbol,Object></em>): The Mix configuration
-  # Return:
-  # * _String_: The resulting mix file
-  def self.execute(iConfig)
-    rPerformMixFile = nil
+  class Mix < Launcher
 
-    lMixInputFile = nil
-    lLstMixFiles = []
-    lMissingFiles = []
-    iConfig[:MixFiles].each do |iMixFileInfo|
-      if (!File.exists?(iMixFileInfo[:FileName]))
-        logErr "File #{iMixFileInfo[:FileName]} does not exist."
-        lMissingFiles << iMixFileInfo[:FileName]
-      else
-        lResultFileName = executeOperations(iMixFileInfo[:FileName], iMixFileInfo[:Operations])
-        if (lMixInputFile == nil)
-          lMixInputFile = lResultFileName
-        else
-          lLstMixFiles << lResultFileName
-        end
-      end
+    protected
+
+    # Give additional command line options banner
+    #
+    # Return::
+    # * _String_: Options banner
+    def getOptionsBanner
+      return '[--name <MixName>]*'
     end
-    if (!lMissingFiles.empty?)
-      logErr "Mix will not be performed as some files were missing: #{lMissingFiles.join(', ')}"
-    else
-      if (lLstMixFiles.empty?)
-        logInfo "Single perform file to mix: #{lMixInputFile}"
-        rPerformMixFile = lMixInputFile
-      else
-        rPerformMixFile = "#{$MusicMasterConf[:Mix][:TempDir]}/Perform.Mix.wav"
-        wsk(lMixInputFile, rPerformMixFile, 'Mix', "--files \"#{lLstMixFiles.join('|1|')}|1\" ")
+
+    # Complete options with the specific ones of this binary
+    #
+    # Parameters::
+    # * *ioOptionParser* (_OptionParser_): The options parser to complete
+    def completeOptionParser(ioOptionParser)
+      @LstMixNames = []
+      ioOptionParser.on( '--name <MixName>', String,
+        'Specify the name of the mix to produce. Can be used several times. If not specified, all mixes will be produced.') do |iArg|
+        @LstMixNames << iArg
       end
-      logInfo "Perform mix result in #{rPerformMixFile}"
     end
 
-    return rPerformMixFile
-  end
+    # Check configuration.
+    #
+    # Parameters::
+    # * *iConf* (<em>map<Symbol,Object></em>): The configuration
+    # Return::
+    # * _Exception_: Error, or nil in case of success
+    def checkConf(iConf)
+      return nil
+    end
 
-  # Execute operations on a Wave file, then give back the resulting file
-  #
-  # Parameters:
-  # * *iInputFile* (_String_): The input wave file
-  # * *iOperations* (<em>list<[String,String]></em>): The list of operations to execute: [Action,Parameters].
-  # Return:
-  # * _String_: The resulting file name
-  def self.executeOperations(iInputFile, iOperations)
-    rResultFileName = iInputFile
+    # Initialize Rake processes and return the task to be built
+    #
+    # Return::
+    # * _Symbol_: Rake target to execute
+    def getRakeTarget
+      initialize_RakeProcesses(:LstMixNames => @LstMixNames)
+      generateRakeFor_Mix
 
-    lBaseName = "#{$MusicMasterConf[:Mix][:TempDir]}/#{File.basename(iInputFile)[0..-5]}"
-    iOperations.each_with_index do |iOperationInfo, iIdxOperation|
-      iAction, iParameters = iOperationInfo
-      lInputFileName = rResultFileName.clone
-      rResultFileName = "#{lBaseName}.#{iIdxOperation}.#{iAction}.wav"
-      # Call wsk if the file does not exist already
-      if (!File.exists?(rResultFileName))
-        wsk(lInputFileName, rResultFileName, iAction, iParameters)
-      end
+      return :Mix
     end
 
-    return rResultFileName
   end
 
 end
 
-rErrorCode = 0
-lConfigFile = ARGV[0]
-if (lConfigFile == nil)
-  logErr 'Please specify the configuration file.'
-  rErrorCode = 1
-elsif (!File.exists?(lConfigFile))
-  logErr "File #{lConfigFile} does not exist."
-  rErrorCode = 2
-else
-  FileUtils::mkdir_p($MusicMasterConf[:Mix][:TempDir])
-  lConfig = nil
-  File.open(lConfigFile, 'r') do |iFile|
-    lConfig = eval(iFile.read)
-  end
-  lMixFile = MusicMaster::execute(lConfig)
-  logInfo "===== Mix saved in #{lMixFile}"
-end
-
-exit rErrorCode
+exit MusicMaster::Mix.new.execute(ARGV)

data/bin/Process.rb

@@ -0,0 +1,55 @@
+#!env ruby
+#--
+# Copyright (c) 2009 - 2012 Muriel Salvan (muriel@x-aeon.com)
+# Licensed under the terms specified in LICENSE file. No warranty is provided.
+#++
+
+require 'MusicMaster/Launcher'
+
+module MusicMaster
+
+  class Process < Launcher
+
+    protected
+
+    # Give additional command line options banner
+    #
+    # Return::
+    # * _String_: Options banner
+    def getOptionsBanner
+      return ''
+    end
+
+    # Complete options with the specific ones of this binary
+    #
+    # Parameters::
+    # * *ioOptionParser* (_OptionParser_): The options parser to complete
+    def completeOptionParser(ioOptionParser)
+    end
+
+    # Check configuration.
+    #
+    # Parameters::
+    # * *iConf* (<em>map<Symbol,Object></em>): The configuration
+    # Return::
+    # * _Exception_: Error, or nil in case of success
+    def checkConf(iConf)
+      return nil
+    end
+
+    # Initialize Rake processes and return the task to be built
+    #
+    # Return::
+    # * _Symbol_: Rake target to execute
+    def getRakeTarget
+      initialize_RakeProcesses
+      generateRakeFor_ProcessSourceFiles
+
+      return :ProcessSourceFiles
+    end
+
+  end
+
+end
+
+exit MusicMaster::Process.new.execute(ARGV)