summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorDamien Zammit <damien@zamaudio.com>2015-08-01 13:41:26 +1000
committerRobin Gareus <robin@gareus.org>2015-08-06 00:28:35 +0200
commitd686cb213f624fb6c006d00eeb53b0e2bf640330 (patch)
treeb51444ba2f3880eb19a325f4dacf1e567746d816 /gtk2_ardour
parent8a08d990580d38e3a1edb641205f05389a0eb1cc (diff)
Added PT .ptf session audio import functionality
Signed-off-by: Damien Zammit <damien@zamaudio.com>
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ardev_common.sh.in2
-rw-r--r--gtk2_ardour/ardour.menus.in3
-rw-r--r--gtk2_ardour/editor.h14
-rw-r--r--gtk2_ardour/editor_actions.cc3
-rw-r--r--gtk2_ardour/editor_audio_import.cc19
-rw-r--r--gtk2_ardour/editor_pt_import.cc253
-rw-r--r--gtk2_ardour/wscript11
7 files changed, 295 insertions, 10 deletions
diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in
index fc287e16ba..eca77916c0 100644
--- a/gtk2_ardour/ardev_common.sh.in
+++ b/gtk2_ardour/ardev_common.sh.in
@@ -34,7 +34,7 @@ export ARDOUR_DLL_PATH=$libs
export GTK_PATH=~/.ardour3:$libs/clearlooks-newer
export VAMP_PATH=$libs/vamp-plugins${VAMP_PATH:+:$VAMP_PATH}
-export LD_LIBRARY_PATH=$libs/qm-dsp:$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/gnomecanvas:$libs/libsndfile:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer:$libs/timecode:$libs/libltc:$libs/canvas:$libs/ardouralsautil${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH=$libs/ptformat:$libs/qm-dsp:$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/gnomecanvas:$libs/libsndfile:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer:$libs/timecode:$libs/libltc:$libs/canvas:$libs/ardouralsautil${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
# DYLD_LIBRARY_PATH is for darwin.
export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH
diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 086d2b88d7..27c030669e 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -22,6 +22,9 @@
<menuitem action='AddTrackBus'/>
<separator/>
<menuitem action='addExistingAudioFiles'/>
+#ifdef PTFORMAT
+ <menuitem action='addExistingPTFiles'/>
+#endif
<!--menuitem action='importFromSession'/-->
<menuitem action='OpenVideo'/>
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 1faf148e19..c137bd736a 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -410,6 +410,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
int get_regionview_count_from_region_list (boost::shared_ptr<ARDOUR::Region>);
+ void do_ptimport(std::string path, ARDOUR::SrcQuality quality);
+
void do_import (std::vector<std::string> paths,
Editing::ImportDisposition disposition,
Editing::ImportMode mode,
@@ -1317,6 +1319,18 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
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);
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 71ce59406a..ebfe2d3fb7 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -688,6 +688,9 @@ Editor::register_actions ()
ActionManager::register_action (rl_actions, X_("removeUnusedRegions"), _("Remove Unused"), sigc::mem_fun (*_regions, &EditorRegions::remove_unused_regions));
+ act = reg_sens (editor_actions, X_("addExistingPTFiles"), _("Import PT session"), sigc::mem_fun (*this, &Editor::external_pt_dialog));
+ ActionManager::write_sensitive_actions.push_back (act);
+
/* the next two are duplicate items with different names for use in two different contexts */
act = reg_sens (editor_actions, X_("addExistingAudioFiles"), _("Import"), sigc::mem_fun (*this, &Editor::external_audio_dialog));
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index 6be0a78136..406b255b46 100644
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -303,6 +303,7 @@ Editor::do_import (vector<string> paths,
} else {
ipw.show ();
ok = (import_sndfiles (paths, disposition, mode, quality, pos, 1, 1, track, false, instrument) == 0);
+ import_status.sources.clear();
}
} else {
@@ -348,6 +349,7 @@ Editor::do_import (vector<string> paths,
}
ok = (import_sndfiles (to_import, disposition, mode, quality, pos, 1, -1, track, replace, instrument) == 0);
+ import_status.sources.clear();
break;
case Editing::ImportDistinctChannels:
@@ -356,6 +358,7 @@ Editor::do_import (vector<string> paths,
to_import.push_back (*a);
ok = (import_sndfiles (to_import, disposition, mode, quality, pos, -1, -1, track, replace, instrument) == 0);
+ import_status.sources.clear();
break;
case Editing::ImportSerializeFiles:
@@ -364,6 +367,7 @@ Editor::do_import (vector<string> paths,
to_import.push_back (*a);
ok = (import_sndfiles (to_import, disposition, mode, quality, pos, 1, 1, track, replace, instrument) == 0);
+ import_status.sources.clear();
break;
case Editing::ImportMergeFiles:
@@ -524,7 +528,6 @@ Editor::import_sndfiles (vector<string> paths,
pos = import_status.pos;
}
- import_status.sources.clear();
return result;
}
@@ -734,7 +737,7 @@ Editor::add_sources (vector<string> paths,
/* generate a per-channel region name so that things work as
* intended
*/
-
+
string path;
if (fs) {
@@ -742,7 +745,7 @@ Editor::add_sources (vector<string> paths,
} else {
region_name = (*x)->name();
}
-
+
if (sources.size() == 2) {
if (n == 0) {
region_name += "-L";
@@ -752,9 +755,9 @@ Editor::add_sources (vector<string> paths,
} else if (sources.size() > 2) {
region_name += string_compose ("-%1", n+1);
}
-
+
track_names.push_back (region_name);
-
+
} else {
if (fs) {
region_name = region_name_from_path (fs->path(), false, false, sources.size(), n);
@@ -825,7 +828,7 @@ Editor::add_sources (vector<string> paths,
* the API simpler.
*/
assert (regions.size() == track_names.size());
-
+
for (vector<boost::shared_ptr<Region> >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) {
boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (*r);
@@ -857,7 +860,7 @@ Editor::add_sources (vector<string> paths,
pos = get_preferred_edit_position ();
}
}
-
+
finish_bringing_in_material (*r, input_chan, output_chan, pos, mode, track, track_names[n], instrument);
rlen = (*r)->length();
@@ -873,7 +876,7 @@ Editor::add_sources (vector<string> paths,
}
commit_reversible_command ();
-
+
/* setup peak file building in another thread */
for (SourceList::iterator x = sources.begin(); x != sources.end(); ++x) {
diff --git a/gtk2_ardour/editor_pt_import.cc b/gtk2_ardour/editor_pt_import.cc
new file mode 100644
index 0000000000..8689d94391
--- /dev/null
+++ b/gtk2_ardour/editor_pt_import.cc
@@ -0,0 +1,253 @@
+/*
+ Copyright (C) 2000-2006 Paul Davis
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <errno.h>
+#include <unistd.h>
+#include <algorithm>
+
+#include "pbd/pthread_utils.h"
+#include "pbd/basename.h"
+#include "pbd/shortpath.h"
+#include "pbd/stateful_diff_command.h"
+
+#include <gtkmm2ext/choice.h>
+
+#include "ardour/audio_track.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/audioregion.h"
+#include "ardour/midi_region.h"
+#include "ardour/midi_track.h"
+#include "ardour/operations.h"
+#include "ardour/region_factory.h"
+#include "ardour/smf_source.h"
+#include "ardour/source_factory.h"
+#include "ardour/utils.h"
+#include "ardour/playlist.h"
+#include "ardour/session.h"
+#include "pbd/memento_command.h"
+
+#include "ptformat/ptfformat.h"
+
+#include "ardour_ui.h"
+#include "cursor_context.h"
+#include "editor.h"
+#include "sfdb_ui.h"
+#include "editing.h"
+#include "audio_time_axis.h"
+#include "midi_time_axis.h"
+#include "session_import_dialog.h"
+#include "gui_thread.h"
+#include "interthread_progress_window.h"
+#include "mouse_cursors.h"
+#include "editor_cursors.h"
+
+#include "i18n.h"
+
+using namespace std;
+using namespace ARDOUR;
+using namespace PBD;
+using namespace Gtk;
+using namespace Gtkmm2ext;
+using namespace Editing;
+using std::string;
+
+/* Functions supporting the incorporation of PT sessions into ardour */
+
+void
+Editor::external_pt_dialog ()
+{
+ std::string ptpath;
+
+ if (_session == 0) {
+ MessageDialog msg (_("You can't import a PT session until you have a session loaded."));
+ msg.run ();
+ 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);
+
+ while (true) {
+ int result = dialog.run();
+
+ if (result == Gtk::RESPONSE_OK) {
+ ptpath = dialog.get_filename ();
+
+ 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;
+ }
+ }
+}
+
+void
+Editor::do_ptimport (std::string ptpath,
+ SrcQuality quality)
+{
+ vector<boost::shared_ptr<Region> > regions;
+ boost::shared_ptr<ARDOUR::Track> track;
+ ARDOUR::PluginInfoPtr instrument;
+ vector<string> to_import;
+ string fullpath;
+ bool ok = false;
+ PTFFormat ptf;
+ framepos_t pos = -1;
+
+ vector<ptflookup_t> ptfwavpair;
+ vector<ptflookup_t> ptfregpair;
+
+ if (ptf.load(ptpath) == -1) {
+ MessageDialog msg (_("Doesn't seem to be a valid PT session file (.ptf only currently supported)"));
+ msg.run ();
+ 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<PTFFormat::wav_t>::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());
+ }
+ }
+
+ for (vector<PTFFormat::region_t>::iterator a = ptf.regions.begin();
+ a != ptf.regions.end(); ++a) {
+ for (vector<ptflookup_t>::iterator p = ptfwavpair.begin();
+ p != ptfwavpair.end(); ++p) {
+ if (p->index1 == a->wave.index) {
+ 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;
+
+ 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);
+
+ just_one.clear();
+ just_one.push_back(*x);
+
+ boost::shared_ptr<Region> r = RegionFactory::create (just_one, plist);
+ regions.push_back(r);
+
+ rp.id = regions.back()->id();
+ rp.index1 = a->index;
+ ptfregpair.push_back(rp);
+ }
+ }
+ }
+ }
+ }
+
+ boost::shared_ptr<AudioTrack> existing_track;
+ uint16_t nth = 0;
+ vector<ptflookup_t> usedtracks;
+ ptflookup_t utr;
+
+ for (vector<PTFFormat::track_t>::iterator a = ptf.tracks.begin();
+ a != ptf.tracks.end(); ++a) {
+ for (vector<ptflookup_t>::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<Region> r = RegionFactory::region_by_id (p->id);
+ vector<ptflookup_t>::iterator lookuptr = usedtracks.begin();
+ vector<ptflookup_t>::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);
+ // Put on existing track
+ boost::shared_ptr<Playlist> playlist = existing_track->playlist();
+ boost::shared_ptr<Region> 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<boost::shared_ptr<AudioTrack> > at (_session->new_audio_track (1, 2, Normal, 0, 1));
+ if (at.empty()) {
+ return;
+ }
+ existing_track = at.back();
+ existing_track->set_name (a->name);
+ boost::shared_ptr<Playlist> playlist = existing_track->playlist();
+ boost::shared_ptr<Region> 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);
+ }
+ }
+ }
+
+ import_status.sources.clear();
+
+ if (ok) {
+ _session->save_state ("");
+ }
+ import_status.all_done = true;
+}
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index fde642c373..7a6f7dc240 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -61,6 +61,7 @@ gtk2_ardour_sources = [
'editor.cc',
'editor_actions.cc',
'editor_audio_import.cc',
+ 'editor_pt_import.cc',
'editor_audiotrack.cc',
'editor_canvas.cc',
'editor_canvas_events.cc',
@@ -397,6 +398,7 @@ def build(bld):
'libgtk2_ardour',
'libgtkmm2ext',
'libcanvas',
+ 'libptformat',
]
obj.target = 'ardour-' + str (bld.env['VERSION']) + '-vst.exe.so'
obj.includes = [ '../libs/fst', '.' ]
@@ -412,6 +414,7 @@ def build(bld):
obj.includes = [ '../libs/fst', '.' ]
obj.name = 'libgtk2_ardour'
obj.target = 'gtk2_ardour'
+
else:
# just the normal executable version of the GTK GUI
if bld.env['build_target'] == 'mingw':
@@ -437,6 +440,7 @@ def build(bld):
'libmidipp',
'libgtkmm2ext',
'libcanvas',
+ 'libptformat',
]
obj.defines = [
@@ -463,6 +467,8 @@ def build(bld):
obj.includes += ['../libs']
+ obj.use += 'libptformat'
+
if bld.env['build_target'] == 'mingw':
obj.linkflags = ['-mwindows']
@@ -633,6 +639,9 @@ def build(bld):
else:
menus_argv = [ '-E', '-P' ]
+ if bld.is_defined('PTFORMAT'):
+ menus_argv += [ '-DPTFORMAT' ]
+
# always build all versions of the menu definitions
# so that we can try them out with different program builds.
for program in [ 'ardour', 'trx' ]:
@@ -641,7 +650,7 @@ def build(bld):
obj.command_is_external = True
obj.no_inputs = True
obj.argv = menus_argv
- obj.dep_vars = ['GTKOSX', 'WINDOWS']
+ obj.dep_vars = ['PTFORMAT', 'GTKOSX', 'WINDOWS']
obj.stdin = program + '.menus.in'
obj.stdout = program + '.menus'
bld.install_files (bld.env['CONFDIR'], program + '.menus')