Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/libdcp

diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index 014b95a217260ae62a96c7503b080631993fce31..e18441c68f60c08ac328a13d237da718ec1edcea 100644 (file)
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -298,7 +298,8 @@ SoundAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, list<str
 shared_ptr<const SoundFrame>
 SoundAsset::get_frame (int n) const
 {
-       return shared_ptr<const SoundFrame> (new SoundFrame (path().string(), n + _entry_point));
+       /* XXX: should add on entry point here? */
+       return shared_ptr<const SoundFrame> (new SoundFrame (path().string(), n));
 }
 
 shared_ptr<SoundAssetWriter>

diff --git a/wscript b/wscript
index 39d99b188689a8c7c02c39cc3c8482e08d635464..192871871071670648a043b3ffa6a57f564c2de5 100644 (file)
--- a/wscript
+++ b/wscript
@@ -2,7 +2,7 @@ import subprocess
 import os
 
 APPNAME = 'libdcp'
-VERSION = '0.42pre'
+VERSION = '0.42'
 
 def options(opt):
     opt.load('compiler_cxx')