additional DEBUG_TRACE output for slave/diskreader

[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 1e8d157f14f1e133023aac9be5361b1537ba5b8c..0ee0810ff29f855885463f5b3d396c25b5fc4fc8 100644 (file)
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -31,7 +31,7 @@
 #include "pbd/shortpath.h"
 #include "pbd/stateful_diff_command.h"
 
-#include <gtkmm2ext/choice.h>
+#include "widgets/choice.h"
 
 #include "ardour/audio_track.h"
 #include "ardour/audiofilesource.h"
@@ -293,7 +293,7 @@ Editor::import_smf_tempo_map (Evoral::SMF const & smf, framepos_t pos)
                        new_map.add_tempo (tempo, (t->time_pulses/smf.ppqn()) / 4.0, 0, MusicTime);
                        if (!(meter == last_meter)) {
                                bbt = new_map.bbt_at_quarter_note ((t->time_pulses/smf.ppqn()));
-                               new_map.add_meter (meter, t->time_pulses, bbt, 0, MusicTime);
+                               new_map.add_meter (meter, bbt, 0, MusicTime);
                        }
 
                } else {
@@ -651,7 +651,7 @@ Editor::embed_sndfiles (vector<string>            paths,
                                choices.push_back (_("Don't embed it"));
                                choices.push_back (_("Embed all without questions"));
 
-                               Gtkmm2ext::Choice rate_choice (
+                               ArdourWidgets::Choice rate_choice (
                                        _("Sample rate"),
                                        string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"),
                                                        short_path (path, 40)),
@@ -677,7 +677,7 @@ Editor::embed_sndfiles (vector<string>            paths,
                                choices.push_back (_("Cancel"));
                                choices.push_back (_("Embed it anyway"));
 
-                               Gtkmm2ext::Choice rate_choice (
+                               ArdourWidgets::Choice rate_choice (
                                        _("Sample rate"),
                                        string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), path),
                                        choices, false