hindbaer 0.0.4 → 0.0.5

data/lib/hindbaer/marker.rb

@@ -1,19 +1,30 @@
 module Hindbaer
   class Marker
-    def initialize(fragment)
-      @doc = fragment
-    end
     
-    def id
-      @doc['Id'].to_i
+    ATTRIBUTES = %w{
+      id name time
+    }
+
+    attr_accessor *ATTRIBUTES
+
+    def self.parse(fragment)
+      new do
+        ATTRIBUTES.each do |attribute|
+          self.send(
+            "#{attribute.to_sym}=",   
+            fragment[attribute.split('_').map(&:capitalize).join]
+          )
+        end
+      end
     end
     
-    def name
-      @doc['Name']
+    def initialize(&block)
+      block.arity > 0 ? block.call(self) : instance_eval(&block)
     end
     
-    def time
-      @doc['Time']
+    def to_xml(xml)
+      xml.Marker Id: id, Name: name, Time: time
     end
+    
   end
 end

data/lib/hindbaer/plugin.rb

@@ -7,16 +7,16 @@ module Hindbaer
   module Plugin
     extend self
     
-    def create(fragment)
+    def parse(fragment)
       case fragment['UID']
       when 'nheq'
-        Hindbaer::Plugin::Equalizer.new(fragment)
+        Hindbaer::Plugin::Equalizer.parse(fragment)
       when 'nhcl'
-        Hindbaer::Plugin::Compressor.new(fragment)
+        Hindbaer::Plugin::Compressor.parse(fragment)
       when 'nhlu'
-        Hindbaer::Plugin::Base.new(fragment)
+        Hindbaer::Plugin::Base.parse(fragment)
       when 'nhft'
-        Hindbaer::Plugin::VoiceProfiler.new(fragment)
+        Hindbaer::Plugin::VoiceProfiler.parse(fragment)
       end
     end
     

data/lib/hindbaer/plugin/base.rb

@@ -2,20 +2,30 @@ module Hindbaer
   module Plugin
     class Base
       
-      def initialize(fragment)
-        @doc = fragment
-      end
+      ATTRIBUTES = %w{
+        id name bypass
+      }
 
-      def id
-        @doc['Id'].to_i
-      end
+      attr_accessor *ATTRIBUTES, :uid
 
-      def name
-        @doc['Name']
+      def self.parse(fragment)
+        new do
+          ATTRIBUTES.each do |attribute|
+            self.send(
+              "#{attribute.to_sym}=",   
+              fragment[attribute.split('_').map(&:capitalize).join]
+            )
+          end
+          self.uid = fragment['UID']
+        end
       end
-
-      def uid
-        @doc['UID']
+      
+      def initialize(&block)
+        block.arity > 0 ? block.call(self) : instance_eval(&block)
+      end
+      
+      def to_xml(xml)
+        xml.Plugin Id: id, Name: name, UID: uid, Bypass: bypass
       end
       
     end

data/lib/hindbaer/plugin/compressor.rb

@@ -2,16 +2,18 @@ module Hindbaer
   module Plugin
     class Compressor < Hindbaer::Plugin::Base
 
-      def uid
-        'nhcl'
-      end
-
-      def name
-        'Compressor'
+      attr_accessor :comp
+      
+      def self.parse(fragment)
+        plugin = super(fragment)
+        
+        plugin.comp = fragment['Comp']
+        
+        plugin
       end
-
-      def comp
-        @doc['Comp']
+      
+      def to_xml(xml)
+        xml.Plugin Id: id, Name: name, UID: uid, Bypass: bypass, Comp: comp
       end
       
     end

data/lib/hindbaer/plugin/equalizer.rb

@@ -1,61 +1,35 @@
 module Hindbaer
   module Plugin
     class Equalizer < Hindbaer::Plugin::Base
+      
+      attr_accessor :low_freq_freq, :low_freq_gain, :low_freq_q
+      attr_accessor :mid_freq_freq, :mid_freq_gain, :mid_freq_q
+      attr_accessor :high_freq_freq, :high_freq_gain, :high_freq_q
+      attr_accessor :low_freq_type, :high_freq_type
 
-      def uid
-        'nheq'
-      end
-
-      def name
-        'Equalizer'
-      end
-
-      def bypass
-        @doc['Bypass']
-      end
-
-      def low_freq_freq
-        @doc['LF_Freq']
-      end
-
-      def low_freq_gain
-        @doc['LF_Gain']      
-      end
-
-      def low_freq_q
-        @doc['LF_Q']
-      end
-
-      def low_freq_type
-        @doc['LF_Type']
-      end
-
-      def mid_freq_freq
-        @doc['MF_Freq']
-      end
-
-      def mid_freq_gain
-        @doc['MF_Gain']
-      end
-
-      def mid_freq_q
-        @doc['MF_Q']
-      end
-
-      def high_freq_freq
-        @doc['HF_Freq']
-      end
-
-      def high_freq_gain
-        @doc['HF_Gain']
-      end
-
-      def high_freq_q
-        @doc['HF_Q']
+      
+      def self.parse(fragment)
+        plugin = super(fragment)
+        
+        plugin.low_freq_freq = fragment['LF_Freq']
+        plugin.low_freq_gain = fragment['LF_Gain']
+        plugin.low_freq_q    = fragment['LF_Q']
+        plugin.low_freq_type = fragment['LF_Type']
+        
+        plugin.mid_freq_freq = fragment['MF_Freq']
+        plugin.mid_freq_gain = fragment['MF_Gain']
+        plugin.mid_freq_q    = fragment['MF_Q']
+        
+        plugin.high_freq_freq = fragment['HF_Freq']
+        plugin.high_freq_gain = fragment['HF_Gain']
+        plugin.high_freq_q    = fragment['HF_Q']
+        plugin.high_freq_type = fragment['HF_Type']
+        
+        plugin
       end
-
-      def high_freq_type
-        @doc['HF_Type']
+      
+      def to_xml(xml)
+        xml.Plugin Id: id, Name: name, UID: uid, Bypass: bypass, LF_Freq: low_freq_freq, LF_Gain: low_freq_gain, LF_Q: low_freq_q, LF_Type: low_freq_type, MF_Freq: mid_freq_freq, MF_Gain: mid_freq_gain, MF_Q: mid_freq_q, HF_Freq: high_freq_freq, HF_Gain: high_freq_gain, HF_Q: high_freq_q, HF_Type: high_freq_type
       end
       
     end

data/lib/hindbaer/plugin/voice_profiler.rb

@@ -2,62 +2,38 @@ module Hindbaer
   module Plugin
     class VoiceProfiler < Hindbaer::Plugin::Base
 
-      def uid
-        'nhft'
+      attr_accessor :comp
+      attr_accessor :low_freq_freq, :low_freq_gain, :low_freq_q
+      attr_accessor :mid_freq_freq, :mid_freq_gain, :mid_freq_q
+      attr_accessor :high_freq_freq, :high_freq_gain, :high_freq_q
+      attr_accessor :high_pass_freq, :high_pass_gain
+
+      def self.parse(fragment)
+        plugin = super(fragment)
+        
+        plugin.comp = fragment['Comp']
+        
+        plugin.low_freq_freq = fragment['LF_Freq']
+        plugin.low_freq_gain = fragment['LF_Gain']
+        plugin.low_freq_q    = fragment['LF_Q']
+        
+        plugin.mid_freq_freq = fragment['MF_Freq']
+        plugin.mid_freq_gain = fragment['MF_Gain']
+        plugin.mid_freq_q    = fragment['MF_Q']
+        
+        plugin.high_freq_freq = fragment['HF_Freq']
+        plugin.high_freq_gain = fragment['HF_Gain']
+        plugin.high_freq_q    = fragment['HF_Q']
+
+        plugin.high_pass_freq = fragment['HP_Freq']
+        plugin.high_pass_gain = fragment['HP_Gain']
+        
+        plugin
+      end
+
+      def to_xml(xml)
+        xml.Plugin Id: id, Name: name, UID: uid, Bypass: bypass, LF_Freq: low_freq_freq, LF_Gain: low_freq_gain, LF_Q: low_freq_q, MF_Freq: mid_freq_freq, MF_Gain: mid_freq_gain, MF_Q: mid_freq_q, HF_Freq: high_freq_freq, HF_Gain: high_freq_gain, HF_Q: high_freq_q, HP_Freq: high_pass_freq, HP_Gain: high_pass_gain, Comp: comp
       end
-
-      def name
-        'Voice Profiler'
-      end
-
-      def low_freq_freq
-        @doc['LF_Freq']
-      end
-
-      def low_freq_gain
-        @doc['LF_Gain']      
-      end
-
-      def low_freq_q
-        @doc['LF_Q']
-      end
-
-      def mid_freq_freq
-        @doc['MF_Freq']
-      end
-
-      def mid_freq_gain
-        @doc['MF_Gain']
-      end
-
-      def mid_freq_q
-        @doc['MF_Q']
-      end
-
-      def high_freq_freq
-        @doc['HF_Freq']
-      end
-
-      def high_freq_gain
-        @doc['HF_Gain']
-      end
-
-      def high_freq_q
-        @doc['HF_Q']
-      end
-
-      def high_pass_freq
-        @doc['HP_Freq']
-      end
-
-      def high_pass_gain
-        @doc['HP_Gain']
-      end
-
-      def comp
-        @doc['Comp']
-      end
-      
     end
   end
 end

data/lib/hindbaer/region.rb

@@ -1,59 +1,35 @@
 module Hindbaer
   class Region
-    def initialize(fragment, track = nil)
-      @doc = fragment
-      @track = track
-    end
-    
-    attr_reader :track
-    
-    def reference
-      id = @doc['Ref'].to_i
-      self.track.session.audio_pool.files.find { |a| a.id == id }
-    end
-    
-    def name
-      @doc['Name']
-    end
-    
-    def start_time
-      @doc['Start'] || '00.0'
-    end
-    
-    def length
-      @doc['Length']
-    end
-    
-    def relative_length
-      length / track.session.length
-    end
     
-    def offset
-      @doc['Offset'] || '00:00'
+    ATTRIBUTES = %w{
+      ref name start offset length fade_in fade_out gain leq dynamics
+    }
+      
+    attr_accessor *ATTRIBUTES
+    attr_accessor :fades
+    
+    def self.parse(fragment)
+      new do
+        ATTRIBUTES.each do |attribute|
+          self.send(
+          "#{attribute.to_sym}=",   
+          fragment[attribute.split('_').map(&:capitalize).join]
+          )
+          
+          self.start = '00.0' unless start
+          
+          self.fades = fragment.css('Fade').map do |f|
+            Hindbaer::Fade.parse(f)
+          end
+        end
+      end
+    end
+    
+    def initialize(&block)
+      self.fades = []
+      
+      block.arity > 0 ? block.call(self) : instance_eval(&block)
     end
     
-    def fade_in
-      @doc['FadeIn']|| '00.0'
-    end
-    
-    def fade_out
-      @doc['FadeOut'] || '00.0'
-    end
-    
-    def gain
-      @doc['Gain'].to_f || 0.0
-    end
-    
-    def leq
-      @doc['Leq'].to_f || 0.0
-    end
-    
-    def dynamics
-      @doc['Dyn'].to_f || 0.0
-    end
-    
-    def fades
-      @doc.css('Fade').map { |f| Hindbaer::Fade.new(f.dup.unlink) }
-    end
   end
 end

data/lib/hindbaer/session.rb

@@ -1,38 +1,49 @@
 module Hindbaer
-  
   class Session
-    def initialize(file)
-      ::File.open(file, 'r') do |file|
-        @doc = Nokogiri::XML(file)
-      end
-    end
-    
-    def software_version
-      @doc.at_css('Session')['Version']
-    end
-    
-    def sample_rate
-      @doc.at_css('Session')['Samplerate']
-    end
     
-    def info
-      Hindbaer::Info.new(@doc.at_css('Info').dup.unlink)
-    end
-    
-    def audio_pool
-      Hindbaer::AudioPool.new(@doc.at_css('AudioPool').dup.unlink)
-    end
-    
-    def tracks
-      @doc.css('Tracks Track').map { |t| Hindbaer::Track.new(t.dup.unlink, self) }
-    end
+    ATTRIBUTES = %w{
+      version samplerate
+      }
+      
+    attr_accessor *ATTRIBUTES
+    attr_accessor :info, :audio_pool, :tracks, :clipboard_groups, :markers
     
-    def clipboard_groups
-      @doc.css('Clipboard Group').map { |g| Hindbaer::Group.new(g.dup.unlink, self) }
+    def self.parse(xml)
+      doc = Nokogiri::XML(xml)
+      
+      new do
+        ATTRIBUTES.each do |attribute|
+          self.send("#{attribute.to_sym}=",
+           doc.at_css('Session')[attribute.capitalize])
+        end
+        
+        self.info = Hindbaer::Info.parse(doc.at_css('Info'))
+        
+        self.audio_pool = 
+          Hindbaer::AudioPool.parse(doc.at_css('AudioPool'))
+        
+        self.tracks = doc.css('Tracks Track').map do |t|
+          Hindbaer::Track.parse(t)
+        end
+        
+        self.clipboard_groups = doc.css('Clipboard Group').map do |g|
+          Hindbaer::Group.parse(g)
+        end
+        
+        self.markers = doc.css('Markers Marker').map do |m|
+          Hindbaer::Marker.parse(m)
+        end
+      end
     end
     
-    def markers
-      @doc.css('Markers Marker').map { |m| Hindbaer::Marker.new(m.dup.unlink) }
+    def initialize(&block)
+      self.info = {}
+      self.audio_pool = {}
+      self.tracks = []
+      self.clipboard_groups = []
+      self.markers = []
+      
+      block.arity > 0 ? block.call(self) : instance_eval(&block)
     end
     
     def length
@@ -41,65 +52,29 @@ module Hindbaer
       end.compact
       
       regions.map do |r| 
-        Hindbaer.tc_to_secs(r.start_time) + 
+        Hindbaer.tc_to_secs(r.start) + 
         Hindbaer.tc_to_secs(r.length)
       end.max
     end
     
     def to_xml
       Nokogiri::XML::Builder.new do |xml|
-        xml.Session Version: software_version, Samplerate: sample_rate do
-          xml.Info Subtitle: info.subtitle, Album: info.album, Composer: info.composer, Track: info.album_track, Genre: info.genre, Author: info.author, Link: info.link, Email: info.email, Description: info.description, Artist: info.artist, Date: info.date, Title: info.title, Explicit: info.explicit? ? 'YES' : 'NO', Copyright: info.copyright, Identifier: info.identifier, Keywords: info.keywords.join(', '), Reference: info.reference
-          xml.AudioPool Path: audio_pool.path, Location: audio_pool.location do
-            audio_pool.files.each do |file|
-              xml.File Id: file.id, Name: file.name, Duration: file.duration, Channels: file.num_channels, Leq: file.leq do
-                xml.MetaData OriginalPath: file.original_path
-              end
-            end
-          end
+        xml.Session Version: version, Samplerate: samplerate do
+          info.to_xml(xml)
+          audio_pool.to_xml(xml)
           xml.Tracks do
             tracks.each do |track|
-              xml.Track Name: track.name, Pan: track.pan do
-                track.regions.each do |region|
-                  xml.Region Ref: region.reference.id, Name: region.name, Start: region.start_time, Length: region.length, Offset: region.offset, FadeIn: region.fade_in, FadeOut: region.fade_out, Gain: region.gain, Leq: region.leq do
-                    region.fades.each do |fade|
-                      xml.Fade Start: fade.start_time, Length: fade.length, Gain: fade.gain
-                    end
-                  end
-                end
-                unless track.plugins.empty?
-                  xml.Plugins do
-                    track.plugins.each do |plugin|
-                      case plugin.uid
-                      when 'nheq'
-                        xml.Plugin Id: plugin.id, Name: plugin.name, UID: plugin.uid, Bypass: plugin.bypass, LF_Freq: plugin.low_freq_freq, LF_Gain: plugin.low_freq_gain, LF_Q: plugin.low_freq_q, LF_Type: plugin.low_freq_type, MF_Freq: plugin.mid_freq_freq, MF_Gain: plugin.mid_freq_gain, MF_Q: plugin.mid_freq_q, HF_Freq: plugin.high_freq_freq, HF_Gain: plugin.high_freq_gain, HF_Q: plugin.high_freq_q, HF_Type: plugin.high_freq_type do
-                          xml.cdata('')
-                        end
-                      when 'nhcl'
-                        xml.Plugin Id: plugin.id, Name: plugin.name, UID: plugin.uid, Comp: plugin.comp
-                      when 'nhlu'
-                        xml.Plugin Id: plugin.id, Name: plugin.name, UID: plugin.uid
-                      when 'nhft'
-                        xml.Plugin Id: plugin.id, Name: plugin.name, UID: plugin.uid, LF_Freq: plugin.low_freq_freq, LF_Gain: plugin.low_freq_gain, LF_Q: plugin.low_freq_q, MF_Freq: plugin.mid_freq_freq, MF_Gain: plugin.mid_freq_gain, MF_Q: plugin.mid_freq_q, HF_Freq: plugin.high_freq_freq, HF_Gain: plugin.high_freq_gain, HF_Q: plugin.high_freq_q, HP_Freq: plugin.high_pass_freq, HP_Gain: plugin.high_pass_gain, Comp: plugin.comp
-                      end
-                    end
-                  end
-                end
-              end
+              track.to_xml(xml)
             end
           end
           xml.Clipboard do
             clipboard_groups.each do |group|
-              xml.Group Caption: group.caption, Used: group.num_clips_used do
-                group.clips.each do |clip|
-                  xml.Clip Ref: clip.reference.id, Name: clip.name, Length: clip.length, Leq: clip.leq
-                end
-              end
+              group.to_xml(xml)
             end
           end
           xml.Markers do
             markers.each do |marker|
-              xml.Marker Id: marker.id, Name: marker.name, Time: marker.time
+              marker.to_xml(xml)
             end
           end
         end