matterhorn_whymper 2.1.0 → 2.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmI2OTkzZjM5ZjExNDIxMDVmM2IxZGE5MDk0YjY2NWQ1MmQwY2MyZQ==
+    OGUzYmU0ZDYxM2M0NTE2OTdhNWU4MDM3ZDJiNmE4M2FjYTYwN2I2NA==
   data.tar.gz: !binary |-
-    MGZlZmMzMWNmNmRkY2EyYmE4ODdiNmJmOGE4NDZhZDdmMDdiZTY3NA==
+    YTNkYzdiNDg3YjlkNzRhOGFlY2ZjNDJhODRiM2Y4OWU3NWI3ZmIwOA==
 SHA512:
   metadata.gz: !binary |-
-    OTZlM2U3MDE5NzIyZTQwODNlM2JmNTE5ZTkxYWEwMjNkZTU4MGNmNDY2MDYy
-    M2U3Zjk5ZTY3MTBlOGViNzg3NDNjODcxZDI1MzhkNjc3MDIyYWU4ZjI2OGE5
-    NTlmMWM5ZTg5MWIzODNlOTc4YTY1Zjg0NTBhNDg1Y2E4ZDZhZjY=
+    YzZiNTkyNTAyNGM4ZWNmMjk2MTkzODIzOTEwZjRmZmFhZjI0MWY3MjM4ZDdh
+    NjYxNmJiYjA2N2JjMGVkZmE5OTkwNGZhYTcyNjIzYjM2N2E2MDZmZTJlYzFk
+    NTBlYjk2ZDMzNGFhMmE0MzViZWI4NjQ1OTEzZTI1ZjY5OTQ2NjM=
   data.tar.gz: !binary |-
-    M2RiNjQyMDAzMGIyMjlhZWI5MjA0OGUxOWUyMTQxMjljNzM4NWU3NGU5NGJi
-    NWI2MzRkMjQyNDYzMjVmZTU3ZmE1MzQwMzA0YjU3YTdhYjJiMmQyNDM1NGM3
-    MjVmNzhjYmMzNmZkNDMyNjJkNmFmZjIyODZlNWQwNTcwZjU3ODc=
+    YWFmMWZjMzY3NDhkNThmOGJkM2Y3OWVkYTcyN2U5ZjQ1NDExNWY5MjkxYjAy
+    OGQyZmY5NmNhYTYzNTVkZTg1NDE0NzU1M2M1Y2UxNzUyYmM0OGM1YTA5MTcw
+    NTgwMzAyMWVkOTQ1YTg2ZDJhMWM3ZWQ2MWZiYTI2OWRmMjczMTQ=

data/lib/matterhorn/smil.rb

@@ -130,6 +130,7 @@ module Matterhorn
       @end_point   = nil
       @rel_begin   = nil
       @duration    = nil
+      @scene_list  = Array.new
       @parent      = parent
     end
 
@@ -148,6 +149,14 @@ module Matterhorn
     end
 
     
+    def add_scene(file, clip_begin, clip_end)
+      scene = Smil::Scene.new(self, file, clip_begin, clip_end)
+      @scene_list.sort! { |a, b| a.clip_begin <=> b.clip_begin }
+      @scene_list << scene
+      scene
+    end
+
+
     # ------------------------------------------------------------------------ protected section ---
     protected
 
@@ -268,6 +277,10 @@ module Matterhorn
         @seq_list.each do |seq|
           seq.to_xml(bx)
         end
+        @scene_list.each do |scene|
+          scene.to_xml(bx)
+        end
+
       end
     end
 
@@ -286,7 +299,6 @@ module Matterhorn
     def initialize(parent)
       super(parent)
       @track_list = Array.new
-      @scene_list = Array.new
     end
 
 
@@ -308,14 +320,6 @@ module Matterhorn
     end
 
 
-    def add_scene(file, clip_begin, clip_end)
-      scene = Smil::Scene.new(self, file, clip_begin, clip_end)
-      @scene_list.sort! { |a, b| a.clip_begin <=> b.clip_begin }
-      @scene_list << scene
-      scene
-    end
-
-
     def propagate(parent_elem)
       @rel_begin = start_point - parent_elem.start_point
       @track_list.each do |track|
@@ -400,7 +404,7 @@ module Matterhorn
 
     def to_xml(bx)
       attributes = Hash.new
-      attributes[:src] = @src.to_s
+      attributes[:src] = @src.to_s    if !@src.nil? && !@src.empty?
       attributes[:clipBegin] = "#{(@clip_begin * 1000).round.to_s}ms"
       attributes[:clipEnd]   = "#{(@clip_end   * 1000).round.to_s}ms"
       bx.video(attributes)

data/lib/matterhorn_whymper/version.rb

@@ -5,7 +5,7 @@ module MatterhornWhymper
 
   # -------------------------------------------------------------------------- const definitions ---
 
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 
 
 end # -------------------------------------------------------------------- end MatterhornWhymper ---

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matterhorn_whymper
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Daniel Fritschi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-12 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post