Expose mixer window screenshot method as Lua binding

[ardour.git] / gtk2_ardour / editor_audio_import.cc

diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index 2d668d214c2d7622d726d6d5e499f5b3d0f0a4fe..dd92c3c21edda26f4ae5360f495bc6c08cb764be 100644 (file)
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -290,9 +290,9 @@ Editor::import_smf_tempo_map (Evoral::SMF const & smf, samplepos_t pos)
                Timecode::BBT_Time bbt; /* 1|1|0 which is correct for the no-meter case */
 
                if (have_initial_meter) {
-                       new_map.add_tempo (tempo, (t->time_pulses/smf.ppqn()) / 4.0, 0, MusicTime);
+                       new_map.add_tempo (tempo, t->time_pulses/ (double)smf.ppqn() / 4.0, 0, MusicTime);
                        if (!(meter == last_meter)) {
-                               bbt = new_map.bbt_at_quarter_note ((t->time_pulses/smf.ppqn()));
+                               bbt = new_map.bbt_at_quarter_note (t->time_pulses/(double)smf.ppqn());
                                new_map.add_meter (meter, bbt, 0, MusicTime);
                        }
 
@@ -305,7 +305,7 @@ Editor::import_smf_tempo_map (Evoral::SMF const & smf, samplepos_t pos)
 
                last_meter = meter;
 
-               cerr << "@ " << t->time_pulses/smf.ppqn() << " ("
+               cerr << "@ " << t->time_pulses/(double)smf.ppqn() << " ("
                     << t->time_seconds << ") Add T " << tempo << " M " << meter << endl;
        }
 
@@ -316,14 +316,14 @@ Editor::import_smf_tempo_map (Evoral::SMF const & smf, samplepos_t pos)
 }
 
 void
-Editor::do_import (vector<string>        paths,
-                   ImportDisposition     disposition,
-                   ImportMode            mode,
-                   SrcQuality            quality,
-                   MidiTrackNameSource   midi_track_name_source,
+Editor::do_import (vector<string>          paths,
+                   ImportDisposition       disposition,
+                   ImportMode              mode,
+                   SrcQuality              quality,
+                   MidiTrackNameSource     midi_track_name_source,
                    MidiTempoMapDisposition smf_tempo_disposition,
-                   samplepos_t&           pos,
-                   ARDOUR::PluginInfoPtr instrument)
+                   samplepos_t&            pos,
+                   ARDOUR::PluginInfoPtr   instrument)
 {
        boost::shared_ptr<Track> track;
        vector<string> to_import;
@@ -547,7 +547,7 @@ Editor::import_sndfiles (vector<string>            paths,
                          ImportDisposition         disposition,
                          ImportMode                mode,
                          SrcQuality                quality,
-                         samplepos_t&               pos,
+                         samplepos_t&              pos,
                          int                       target_regions,
                          int                       target_tracks,
                          boost::shared_ptr<Track>& track,
@@ -617,7 +617,7 @@ Editor::embed_sndfiles (vector<string>            paths,
                         bool&                     check_sample_rate,
                         ImportDisposition         disposition,
                         ImportMode                mode,
-                        samplepos_t&               pos,
+                        samplepos_t&              pos,
                         int                       target_regions,
                         int                       target_tracks,
                         boost::shared_ptr<Track>& track,
@@ -739,7 +739,7 @@ Editor::embed_sndfiles (vector<string>            paths,
 int
 Editor::add_sources (vector<string>            paths,
                      SourceList&               sources,
-                     samplepos_t&               pos,
+                     samplepos_t&              pos,
                      ImportDisposition         disposition,
                      ImportMode                mode,
                      int                       target_regions,