Fix source/region length on MIDI import.

git-svn-id: svn://localhost/ardour2/branches/3.0@3391 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index 4befd2ab0083ca9d71bff1ddacbe74b7009cf112..c9d287c29207ed2a0c06bd03ba259e0a731fb7ca 100644 (file)
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -343,7 +343,7 @@ write_midi_data_to_new_files (SMFReader* source, Session::import_status& status,
                                        smfs->session().engine().frame_rate(),
                                        smfs->session().tempo_map().meter_at(timeline_position));
 
-               smfs->update_length(0, (nframes_t) floor ((t * source->ppqn()) * frames_per_beat));
+               smfs->update_length(0, (nframes_t) floor ((t / source->ppqn()) * frames_per_beat));
 
                smfs->flush_header();
                smfs->flush_footer();

diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc
index 6ec5f6cf468870a9c03bb0311fd61cfe398eeeac..e9a94b4f19ba18a7c3c28d6a4a80e6a056c8e2d0 100644 (file)
--- a/libs/ardour/smf_source.cc
+++ b/libs/ardour/smf_source.cc
@@ -71,8 +71,6 @@ SMFSource::SMFSource (Session& s, std::string path, Flag flags)
                throw failed_constructor ();
        }
 
-       cerr << "SMF Source path: " << path << endl;
-       
        assert(_name.find("/") == string::npos);
 }