ardour/livetrax
13
0
Fork 0
Code

import_pt.cc: Remove process lock on AudioEngine && save less often

Browse Source
This commit is contained in:
Damien Zammit 2020-03-14 11:50:54 +11:00
parent 91c92f8e25
commit d95f6039f8
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/ardour/import_pt.cc
View File

@ -209,8 +209,6 @@ Session::import_pt (PTFFormat& ptf, ImportStatus& status)
vector<ptflookup_t> usedtracks; vector<ptflookup_t> usedtracks;
ptflookup_t utr; ptflookup_t utr;
Glib::Threads::Mutex::Lock lx (AudioEngine::instance()->process_lock (), Glib::Threads::NOT_LOCK);
for (w = ptf.audiofiles ().begin (); w != ptf.audiofiles ().end () && !status.cancel; ++w) { for (w = ptf.audiofiles ().begin (); w != ptf.audiofiles ().end () && !status.cancel; ++w) {
ptflookup_t p; ptflookup_t p;
ok = false; ok = false;
@ -271,7 +269,6 @@ Session::import_pt (PTFFormat& ptf, ImportStatus& status)
info << _("All audio files found for PT import!") << endmsg; info << _("All audio files found for PT import!") << endmsg;
} }
lx.acquire();
save_state(""); save_state("");
for (vector<PTFFormat::region_t>::const_iterator a = ptf.regions ().begin (); for (vector<PTFFormat::region_t>::const_iterator a = ptf.regions ().begin ();
@ -327,12 +324,10 @@ Session::import_pt (PTFFormat& ptf, ImportStatus& status)
/* Use existing track if possible */ /* Use existing track if possible */
existing_track = get_nth_audio_track (found->index2 + 1); existing_track = get_nth_audio_track (found->index2 + 1);
if (!existing_track) { if (!existing_track) {
lx.release();
list<boost::shared_ptr<AudioTrack> > at (new_audio_track (1, 2, 0, 1, "", PresentationInfo::max_order, Normal)); list<boost::shared_ptr<AudioTrack> > at (new_audio_track (1, 2, 0, 1, "", PresentationInfo::max_order, Normal));
if (at.empty ()) { if (at.empty ()) {
return; return;
} }
lx.acquire();
existing_track = at.back (); existing_track = at.back ();
} }
/* Put on existing track */ /* Put on existing track */
@ -342,14 +337,12 @@ Session::import_pt (PTFFormat& ptf, ImportStatus& status)
playlist->add_region (copy, a->reg.startpos); playlist->add_region (copy, a->reg.startpos);
//add_command (new StatefulDiffCommand (playlist)); //add_command (new StatefulDiffCommand (playlist));
} else { } else {
lx.release();
/* Put on a new track */ /* 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)); 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<boost::shared_ptr<AudioTrack> > at (new_audio_track (1, 2, 0, 1, "", PresentationInfo::max_order, Normal)); list<boost::shared_ptr<AudioTrack> > at (new_audio_track (1, 2, 0, 1, "", PresentationInfo::max_order, Normal));
if (at.empty ()) { if (at.empty ()) {
return; return;
} }
lx.acquire();
existing_track = at.back (); existing_track = at.back ();
std::string trackname; std::string trackname;
try { try {
@ -372,15 +365,12 @@ Session::import_pt (PTFFormat& ptf, ImportStatus& status)
nth++; nth++;
} }
usedtracks.push_back (utr); usedtracks.push_back (utr);
save_state("");
} }
} }
} }
lx.release();
trymidi: trymidi:
save_state("");
status.paths.clear(); status.paths.clear();
status.paths.push_back(ptf.path ()); status.paths.push_back(ptf.path ());
status.current = 1; status.current = 1;