one-k-rmov 0.2.3 → 0.2.4

data/CHANGELOG

@@ -1,4 +1,9 @@
+0.2.4 (February 27, 2009)
+
+* changes symbols case to match QuickTime constants for channel descriptions (eg. :left becomes :Left)
+
 0.2.3 (February 27, 2009)
+
 * minor changes, administrative
 
 0.2.1 (February 26, 2009)

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('rmov', '0.2.3') do |p|
+Echoe.new('rmov', '0.2.4') do |p|
   p.summary        = "Ruby wrapper for the QuickTime C API."
   p.description    = "Ruby wrapper for the QuickTime C API.  Updates by 1K include exposing some movie properties such as codec and audio channel descriptions"
   p.url            = "http://github.com/ryanb/rmov"

data/ext/track.c

@@ -389,40 +389,94 @@ static char* track_str_for_AudioChannelLabel(label) {
   switch (label) {
     
     case kAudioChannelLabel_Left:
-      trackStr = "left";
+      trackStr = "Left";
       break;
     case kAudioChannelLabel_Right:
-      trackStr = "right";
+      trackStr = "Right";
       break;
     case kAudioChannelLabel_Center:
-      trackStr = "center";
+      trackStr = "Center";
       break;
     case kAudioChannelLabel_LFEScreen:
       trackStr = "LFEScreen";
       break;
     case kAudioChannelLabel_LeftSurround:
-      trackStr = "leftSurround";
+      trackStr = "LeftSurround";
       break;
     case kAudioChannelLabel_RightSurround:
-      trackStr = "rightSurround";
+      trackStr = "RightSurround";
       break;
     case kAudioChannelLabel_LeftCenter:
-      trackStr = "leftCenter";
+      trackStr = "LeftCenter";
       break;
     case kAudioChannelLabel_RightCenter:
-      trackStr = "rightCenter";
+      trackStr = "RightCenter";
       break;
     case kAudioChannelLabel_CenterSurround:
-      trackStr = "centerSurround";
+      trackStr = "CenterSurround";
       break;
     case kAudioChannelLabel_LeftSurroundDirect:
-      trackStr = "leftSurroundDirect";
+      trackStr = "LeftSurroundDirect";
       break;
     case kAudioChannelLabel_RightSurroundDirect:
-      trackStr = "rightSurroundDirect";
+      trackStr = "RightSurroundDirect";
       break;
     case kAudioChannelLabel_TopCenterSurround:
-      trackStr = "topCenterSurround";
+      trackStr = "TopCenterSurround";
+      break;
+    case kAudioChannelLabel_VerticalHeightLeft:
+      trackStr = "VerticalHeightLeft";
+      break;
+    case kAudioChannelLabel_VerticalHeightCenter:
+      trackStr = "VerticalHeightCenter";
+      break;
+    case kAudioChannelLabel_VerticalHeightRight:
+      trackStr = "VerticalHeightRight";
+      break;
+    case kAudioChannelLabel_TopBackLeft:
+      trackStr = "TopBackLeft";
+      break;
+    case kAudioChannelLabel_TopBackCenter:
+      trackStr = "TopBackCenter";
+      break;
+    case kAudioChannelLabel_TopBackRight:
+      trackStr = "TopBackRight";
+      break;
+    case kAudioChannelLabel_RearSurroundLeft:
+      trackStr = "RearSurroundLeft";
+      break;
+    case kAudioChannelLabel_RearSurroundRight:
+      trackStr = "RearSurroundRight";
+      break;
+    case kAudioChannelLabel_LeftWide:
+      trackStr = "LeftWide";
+      break;
+    case kAudioChannelLabel_RightWide:
+      trackStr = "RightWide";
+      break;
+    case kAudioChannelLabel_LFE2:
+      trackStr = "LFE2";
+      break;
+    case kAudioChannelLabel_LeftTotal:
+      trackStr = "LeftTotal";
+      break;
+    case kAudioChannelLabel_RightTotal:
+      trackStr = "RightTotal";
+      break;
+    case kAudioChannelLabel_HearingImpaired:
+      trackStr = "HearingImpaired";
+      break;
+    case kAudioChannelLabel_Narration:
+      trackStr = "Narration";
+      break;
+    case kAudioChannelLabel_Mono:
+      trackStr = "Mono";
+      break;
+    case kAudioChannelLabel_DialogCentricMix:
+      trackStr = "DialogCentricMix";
+      break;
+    case kAudioChannelLabel_CenterSurroundDirect:
+      trackStr = "CenterSurroundDirect";
       break;
 
     default:
@@ -474,13 +528,18 @@ static VALUE track_get_audio_channel_map(VALUE obj)
       switch (layoutTag) {
 
         case kAudioChannelLayoutTag_Mono:
-          ADD_CHANNEL(channels, channel, "mono");
+          ADD_CHANNEL(channels, channel, "Mono");
           break;
         
         case kAudioChannelLayoutTag_Stereo:
-          ADD_CHANNEL(channels, channel, "left");
-          ADD_CHANNEL(channels, channel, "right");
+          ADD_CHANNEL(channels, channel, "Left");
+          ADD_CHANNEL(channels, channel, "Right");
           break;
+          
+        case kAudioChannelLayoutTag_MatrixStereo :
+          ADD_CHANNEL(channels, channel, "LeftTotal");
+          ADD_CHANNEL(channels, channel, "RightTotal");
+          
 
         default:
           // unsupported

data/rmov.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rmov}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Bates, with updates by 1K Studios, LLC"]
-  s.date = %q{2009-02-27}
+  s.date = %q{2009-03-01}
   s.description = %q{Ruby wrapper for the QuickTime C API.  Updates by 1K include exposing some movie properties such as codec and audio channel descriptions}
   s.email = %q{ryan (at) railscasts (dot) com}
   s.extensions = ["ext/extconf.rb"]

data/spec/quicktime/hd_track_spec.rb

@@ -35,13 +35,13 @@ describe QuickTime::Track do
       end
       
       it "should have an audio channel map with tags" do
-        @track.channel_map[0][:assignment].should == :left
-        @track.channel_map[1][:assignment].should == :right
+        @track.channel_map[0][:assignment].should == :Left
+        @track.channel_map[1][:assignment].should == :Right
       end
       
       it "should have all audio tracks > 1 mono" do
         @movie.audio_tracks[1..-1].each do |tr|
-          tr.channel_map[0][:assignment].should == :mono
+          tr.channel_map[0][:assignment].should == :Mono
         end
       end
 
@@ -57,26 +57,26 @@ describe QuickTime::Track do
     it "has audio track 0 with left/right" do
       track = @movie.audio_tracks[0]
       track.channel_map.should_not == nil
-      track.channel_map[0][:assignment].should == :left
-      track.channel_map[1][:assignment].should == :right
+      track.channel_map[0][:assignment].should == :Left
+      track.channel_map[1][:assignment].should == :Right
     end
 
     it "has audio track 1 with left/right" do
       track = @movie.audio_tracks[1]
       track.channel_map.should_not == nil
-      track.channel_map[0][:assignment].should == :left
+      track.channel_map[0][:assignment].should == :Left
     end
     
     it "has audio tracks with proper assignments" do
       channel_maps = @movie.audio_tracks.collect {|tr| tr.channel_map}
       channel_maps.should == [
-        [{:assignment => :left}, {:assignment => :right}],
-        [{:assignment => :left}],
-        [{:assignment => :right}],
-        [{:assignment => :center}],
+        [{:assignment => :Left}, {:assignment => :Right}],
+        [{:assignment => :Left}],
+        [{:assignment => :Right}],
+        [{:assignment => :Center}],
         [{:assignment => :LFEScreen}],
-        [{:assignment => :leftSurround}],
-        [{:assignment => :rightSurround}],
+        [{:assignment => :LeftSurround}],
+        [{:assignment => :RightSurround}],
         ]
     end
 
@@ -91,13 +91,13 @@ describe QuickTime::Track do
     it "has audio tracks with proper assignments" do
       channel_maps = @movie.audio_tracks.collect {|tr| tr.channel_map}
       channel_maps.should == [
-        [{:assignment => :left}, {:assignment => :right}],
-        [{:assignment => :mono}],
-        [{:assignment => :mono}],
-        [{:assignment => :mono}],
-        [{:assignment => :mono}],
-        [{:assignment => :mono}],
-        [{:assignment => :mono}],
+        [{:assignment => :Left}, {:assignment => :Right}],
+        [{:assignment => :Mono}],
+        [{:assignment => :Mono}],
+        [{:assignment => :Mono}],
+        [{:assignment => :Mono}],
+        [{:assignment => :Mono}],
+        [{:assignment => :Mono}],
         ]
     end 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: one-k-rmov
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Ryan Bates, with updates by 1K Studios, LLC
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-27 00:00:00 -08:00
+date: 2009-03-01 00:00:00 -08:00
 default_executable: 
 dependencies: []