From 031b910cab6446998baa029dc8be3170a5c056f1 Mon Sep 17 00:00:00 2001 From: Damien Zammit Date: Wed, 10 Oct 2018 20:13:14 +1100 Subject: PT import: editor_pt_import complete rewrite --- gtk2_ardour/editor.h | 21 ++- gtk2_ardour/editor_pt_import.cc | 313 +++++----------------------------------- 2 files changed, 46 insertions(+), 288 deletions(-) diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 1f66a69c78..5a91582d10 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -61,6 +61,8 @@ #include "selection_memento.h" #include "tempo_curve.h" +#include + namespace Gtkmm2ext { class Bindings; } @@ -1346,18 +1348,6 @@ private: void insert_region_list_selection (float times); - /* PT import */ - void external_pt_dialog (); - typedef struct ptflookup { - uint16_t index1; - uint16_t index2; - PBD::ID id; - - bool operator ==(const struct ptflookup& other) { - return (this->index1 == other.index1); - } - } ptflookup_t; - /* import & embed */ void add_external_audio_action (Editing::ImportMode); @@ -1427,6 +1417,13 @@ private: void external_audio_dialog (); void session_import_dialog (); + /* PT import specific */ + void external_pt_dialog (); + ARDOUR::ImportStatus import_pt_status; + static void *_import_pt_thread (void *); + void* import_pt_thread (); + PTFFormat import_ptf; + /* import specific info */ struct EditorImportStatus : public ARDOUR::ImportStatus { diff --git a/gtk2_ardour/editor_pt_import.cc b/gtk2_ardour/editor_pt_import.cc index db9fc03b2d..12b6484b78 100644 --- a/gtk2_ardour/editor_pt_import.cc +++ b/gtk2_ardour/editor_pt_import.cc @@ -58,6 +58,7 @@ #include "interthread_progress_window.h" #include "mouse_cursors.h" #include "editor_cursors.h" +#include "pt_import_selector.h" #include "pbd/i18n.h" @@ -69,7 +70,7 @@ using namespace Gtkmm2ext; using namespace Editing; using std::string; -/* Functions supporting the incorporation of PT sessions into ardour */ +/* Editor dialogs supporting the incorporation of PT sessions into ardour */ void Editor::external_pt_dialog () @@ -82,297 +83,57 @@ Editor::external_pt_dialog () return; } - Gtk::FileChooserDialog dialog (_("Import PT Session"), FILE_CHOOSER_ACTION_OPEN); - dialog.add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); - dialog.add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK); + PTImportSelector dialog (import_ptf); + dialog.set_session (_session); while (true) { int result = dialog.run (); - if (result == Gtk::RESPONSE_OK) { - ptpath = dialog.get_filename (); + if (result == Gtk::RESPONSE_ACCEPT) { - if (!Glib::file_test (ptpath, Glib::FILE_TEST_IS_DIR|Glib::FILE_TEST_EXISTS)) { - Gtk::MessageDialog msg (string_compose (_("%1: this is only the directory/folder name, not the filename.\n"), ptpath)); - msg.run (); - continue; - } - } - - if (ptpath.length ()) { - do_ptimport (ptpath, SrcBest); - break; - } - - if (result == Gtk::RESPONSE_CANCEL) { - break; - } - } -} - -struct midipair { - midipair (uint16_t idx, string n) - : ptfindex (idx) - , trname (n) - {} - uint16_t ptfindex; - string trname; -}; - -void -Editor::do_ptimport (std::string ptpath, - SrcQuality quality) -{ - vector > regions; - boost::shared_ptr track; - ARDOUR::PluginInfoPtr instrument; - vector to_import; - string fullpath; - bool ok = false; - bool onefailed = false; - PTFFormat ptf; - samplepos_t pos = -1; - uint32_t srate = _session->sample_rate (); - - vector ptfwavpair; - vector ptfregpair; - - if (ptf.load (ptpath, srate) == -1) { - MessageDialog msg (_("Doesn't seem to be a valid PT session file")); - msg.run (); - return; - } else { - MessageDialog msg (string_compose (_("PT v%1 Session @ %2Hz\n\n%3 audio files\n%4 audio regions\n%5 active audio regions\n%6 midi regions\n%7 active midi regions\n\nContinue..."), (int)ptf.version, ptf.sessionrate, ptf.audiofiles.size (), ptf.regions.size (), ptf.tracks.size (), ptf.midiregions.size (), ptf.miditracks.size ())); - msg.add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); - - int result = msg.run (); - if (result != Gtk::RESPONSE_OK) { - return; - } - } - current_interthread_info = &import_status; - import_status.current = 1; - import_status.total = ptf.audiofiles.size (); - import_status.all_done = false; - - ImportProgressWindow ipw (&import_status, _("Import"), _("Cancel Import")); - - SourceList just_one; - SourceList imported; - - for (vector::iterator a = ptf.audiofiles.begin (); a != ptf.audiofiles.end (); ++a) { - ptflookup_t p; - - fullpath = Glib::build_filename (Glib::path_get_dirname (ptpath), "Audio Files"); - fullpath = Glib::build_filename (fullpath, a->filename); - to_import.clear (); - to_import.push_back (fullpath); - ipw.show (); - ok = import_sndfiles (to_import, Editing::ImportDistinctFiles, Editing::ImportAsRegion, quality, pos, 1, -1, track, false, instrument); - if (!import_status.sources.empty ()) { - p.index1 = a->index; - p.id = import_status.sources.back ()->id (); - - ptfwavpair.push_back (p); - imported.push_back (import_status.sources.back ()); - } else { - /* ptformat does not know the length of sources so we cannot do this: - XMLNode srcxml (X_("Source")); - srcxml.set_property ("name", a->filename); - srcxml.set_property ("type", "audio"); - srcxml.set_property ("id", PBD::ID ().to_s ()); - boost::shared_ptr source = SourceFactory::createSilent (*_session, srcxml, a->length, _session->sample_rate ()); - p.index1 = a->index; - p.id = source->id (); - ptfwavpair.push_back (p); - imported.push_back (source); - */ - onefailed = true; - } - } - - if (onefailed) { - MessageDialog msg (_("Failed to load one or more of the audio files. Click to attempt partial import.")); - msg.run (); - } else { - MessageDialog msg (_("Success! All audio files found. Click to complete import.")); - msg.run (); - } - - for (vector::iterator a = ptf.regions.begin (); - a != ptf.regions.end (); ++a) { - for (vector::iterator p = ptfwavpair.begin (); - p != ptfwavpair.end (); ++p) { - if ((p->index1 == a->wave.index) && (strcmp (a->wave.filename.c_str (), "") != 0)) { - for (SourceList::iterator x = imported.begin (); x != imported.end (); ++x) { - if ((*x)->id () == p->id) { - /* Matched an uncreated ptf region to ardour region */ - ptflookup_t rp; - PropertyList plist; + import_pt_status.all_done = false; - plist.add (ARDOUR::Properties::start, a->sampleoffset); - plist.add (ARDOUR::Properties::position, 0); - plist.add (ARDOUR::Properties::length, a->length); - plist.add (ARDOUR::Properties::name, a->name); - plist.add (ARDOUR::Properties::layer, 0); - plist.add (ARDOUR::Properties::whole_file, false); - plist.add (ARDOUR::Properties::external, true); + ImportProgressWindow ipw (&import_pt_status, _("PT Import"), _("Cancel Import")); + pthread_create_and_store ("import_pt", &import_pt_status.thread, _import_pt_thread, this); + pthread_detach (import_pt_status.thread); - just_one.clear (); - just_one.push_back (*x); + ipw.show(); - boost::shared_ptr r = RegionFactory::create (just_one, plist); - regions.push_back (r); - - rp.id = regions.back ()->id (); - rp.index1 = a->index; - ptfregpair.push_back (rp); - } - } + while (!import_pt_status.all_done) { + gtk_main_iteration (); } - } - } - - boost::shared_ptr existing_track; - uint16_t nth = 0; - vector usedtracks; - ptflookup_t utr; - for (vector::iterator a = ptf.tracks.begin (); a != ptf.tracks.end (); ++a) { - for (vector::iterator p = ptfregpair.begin (); - p != ptfregpair.end (); ++p) { - - if (p->index1 == a->reg.index) { - /* Matched a ptf active region to an ardour region */ - utr.index1 = a->index; - utr.index2 = nth; - utr.id = p->id; - boost::shared_ptr r = RegionFactory::region_by_id (p->id); - vector::iterator lookuptr = usedtracks.begin (); - vector::iterator found; - if ((found = std::find (lookuptr, usedtracks.end (), utr)) != usedtracks.end ()) { - DEBUG_TRACE (DEBUG::FileUtils, string_compose ("\twav(%1) reg(%2) ptf_tr(%3) ard_tr(%4)\n", a->reg.wave.filename.c_str (), a->reg.index, found->index1, found->index2)); - existing_track = get_nth_selected_audio_track (found->index2); // FIXME, don't rely on selection - /* Put on existing track */ - boost::shared_ptr playlist = existing_track->playlist (); - boost::shared_ptr copy (RegionFactory::create (r, true)); - playlist->clear_changes (); - playlist->add_region (copy, a->reg.startpos); - //_session->add_command (new StatefulDiffCommand (playlist)); - } else { - /* Put on a new track */ - DEBUG_TRACE (DEBUG::FileUtils, string_compose ("\twav(%1) reg(%2) new_tr(%3)\n", a->reg.wave.filename.c_str (), a->reg.index, nth)); - list > at (_session->new_audio_track (1, 2, 0, 1, "", PresentationInfo::max_order, Normal)); - if (at.empty ()) { - return; - } - existing_track = at.back (); - std::string trackname; - try { - trackname = Glib::convert_with_fallback (a->name, "UTF-8", "UTF-8", "_"); - } catch (Glib::ConvertError& err) { - trackname = string_compose ("Invalid %1", a->index); - } - /* TODO legalize track name (no slashes, no colons) */ -#if 0 /* TODO -- "find_route_name" is currently private */ - /* generate a unique name by adding a number if needed */ - uint32_t id = 0; - if (!_session->find_route_name (trackname.c_str (), id, trackname, false)) { - fatal << _("PTImport: UINT_MAX routes? impossible!") << endmsg; - abort(); /*NOTREACHED*/ - } -#endif - existing_track->set_name (trackname); - boost::shared_ptr playlist = existing_track->playlist(); - boost::shared_ptr copy (RegionFactory::create (r, true)); - playlist->clear_changes (); - playlist->add_region (copy, a->reg.startpos); - //_session->add_command (new StatefulDiffCommand (playlist)); - nth++; - } - usedtracks.push_back (utr); + // wait for thread to terminate + while (!import_pt_status.done) { + gtk_main_iteration (); } - } - } - - /* MIDI - Find list of unique midi tracks first */ - vector uniquetr; - - for (vector::iterator a = ptf.miditracks.begin (); a != ptf.miditracks.end (); ++a) { - bool found = false; - for (vector::iterator b = uniquetr.begin (); b != uniquetr.end (); ++b) { - if (b->trname == a->name) { - found = true; - break; + if (import_pt_status.cancel) { + MessageDialog msg (_("PT import may have missing files, check session log for details")); + msg.run (); + } else { + MessageDialog msg (_("PT import complete!")); + msg.run (); } + break; + } else if (result == Gtk::RESPONSE_CANCEL) { + break; } - if (!found) { - uniquetr.push_back (midipair (a->index, a->name)); - //printf(" : %d : %s\n", a->index, a->name.c_str()); - } - } - - std::map > midi_tracks; - /* MIDI - Create unique midi tracks and a lookup table for used tracks */ - for (vector::iterator a = uniquetr.begin (); a != uniquetr.end (); ++a) { - ptflookup_t miditr; - list > mt (_session->new_midi_track ( - ChanCount (DataType::MIDI, 1), - ChanCount (DataType::MIDI, 1), - true, - instrument, (Plugin::PresetRecord*) 0, - (RouteGroup*) 0, - 1, - a->trname, - PresentationInfo::max_order, - Normal)); - assert (mt.size () == 1); - midi_tracks[a->ptfindex] = mt.front (); } +} - /* MIDI - Add midi regions one-by-one to corresponding midi tracks */ - for (vector::iterator a = ptf.miditracks.begin (); a != ptf.miditracks.end (); ++a) { - - boost::shared_ptr midi_track = midi_tracks[a->index]; - assert (midi_track); - boost::shared_ptr playlist = midi_track->playlist (); - samplepos_t f = (samplepos_t)a->reg.startpos * srate / 1920000.; - samplecnt_t length = (samplecnt_t)a->reg.length * srate / 1920000.; - MusicSample pos (f, 0); - boost::shared_ptr src = _session->create_midi_source_by_stealing_name (midi_track); - PropertyList plist; - plist.add (ARDOUR::Properties::start, 0); - plist.add (ARDOUR::Properties::length, length); - plist.add (ARDOUR::Properties::name, PBD::basename_nosuffix (src->name ())); - //printf(" : %d - trackname: (%s)\n", a->index, src->name ().c_str ()); - boost::shared_ptr region = (RegionFactory::create (src, plist)); - /* sets beat position */ - region->set_position (pos.sample, pos.division); - midi_track->playlist ()->add_region (region, pos.sample, 1.0, false, pos.division); - - boost::shared_ptr mr = boost::dynamic_pointer_cast(region); - boost::shared_ptr mm = mr->midi_source (0)->model (); - MidiModel::NoteDiffCommand *midicmd; - midicmd = mm->new_note_diff_command ("Import ProTools MIDI"); - - for (vector::iterator j = a->reg.midi.begin (); j != a->reg.midi.end (); ++j) { - //printf(" : MIDI : pos=%f len=%f\n", (float)j->pos / 960000., (float)j->length / 960000.); - Temporal::Beats start = (Temporal::Beats)(j->pos / 960000.); - Temporal::Beats len = (Temporal::Beats)(j->length / 960000.); - /* PT C-2 = 0, Ardour C-1 = 0, subtract twelve to convert ? */ - midicmd->add (boost::shared_ptr > (new Evoral::Note ((uint8_t)1, start, len, j->note, j->velocity))); - } - mm->apply_command (_session, midicmd); - boost::shared_ptr copy (RegionFactory::create (mr, true)); - playlist->clear_changes (); - playlist->add_region (copy, f); - } +void * +Editor::_import_pt_thread (void *arg) +{ + SessionEvent::create_per_thread_pool ("import pt events", 64); - import_status.sources.clear (); + Editor *ed = (Editor *) arg; + return ed->import_pt_thread (); +} - if (ok) { - _session->save_state (""); - } - import_status.all_done = true; +void * +Editor::import_pt_thread () +{ + _session->import_pt (import_ptf, import_pt_status); + return 0; } -- cgit v1.2.3