smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-17 12:16:30 +01:00
Code Issues Projects Releases Wiki Activity

tempo match midi auditioning - #5881

Browse source
This commit is contained in:
Robin Gareus 2014-03-10 00:48:48 +01:00
parent 07d5a389fa
commit 1374501727
4 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
gtk2_ardour/sfdb_ui.cc
View file

@ -474,6 +474,23 @@ SoundFileBox::audition ()
r = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (srclist, plist, false)); r = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (srclist, plist, false));
} }
frameoffset_t audition_position = 0;
switch(_import_position) {
case ImportAtTimestamp:
audition_position = 0;
break;
case ImportAtPlayhead:
audition_position = _session->transport_frame();
break;
case ImportAtStart:
audition_position = _session->current_start_frame();
break;
case ImportAtEditPoint:
audition_position = PublicEditor::instance().get_preferred_edit_position ();
break;
}
r->set_position(audition_position);
_session->audition_region(r); _session->audition_region(r);
} }
@ -1662,6 +1679,7 @@ SoundFileOmega::SoundFileOmega (string title, ARDOUR::Session* s,
str.push_back (_("session start")); str.push_back (_("session start"));
set_popdown_strings (where_combo, str); set_popdown_strings (where_combo, str);
where_combo.set_active_text (str.front()); where_combo.set_active_text (str.front());
where_combo.signal_changed().connect (sigc::mem_fun (*this, &SoundFileOmega::where_combo_changed));
Label* l = manage (new Label); Label* l = manage (new Label);
l->set_markup (_("<b>Add files as ...</b>")); l->set_markup (_("<b>Add files as ...</b>"));
@ -1855,6 +1873,12 @@ SoundFileOmega::src_combo_changed()
preview.set_src_quality(get_src_quality()); preview.set_src_quality(get_src_quality());
} }
void
SoundFileOmega::where_combo_changed()
{
preview.set_import_position(get_position());
}
ImportDisposition ImportDisposition
SoundFileOmega::get_channel_disposition () const SoundFileOmega::get_channel_disposition () const
{ {

3
gtk2_ardour/sfdb_ui.h
View file

@ -71,6 +71,7 @@ class SoundFileBox : public Gtk::VBox, public ARDOUR::SessionHandlePtr, public P
bool audition_oneshot(); bool audition_oneshot();
bool autoplay () const; bool autoplay () const;
void set_src_quality(ARDOUR::SrcQuality q) { _src_quality = q; } void set_src_quality(ARDOUR::SrcQuality q) { _src_quality = q; }
void set_import_position(Editing::ImportPosition p) { _import_position = p; }
protected: protected:
std::string path; std::string path;
@ -119,6 +120,7 @@ class SoundFileBox : public Gtk::VBox, public ARDOUR::SessionHandlePtr, public P
bool seek_button_release(GdkEventButton*); bool seek_button_release(GdkEventButton*);
bool _seeking; bool _seeking;
ARDOUR::SrcQuality _src_quality; ARDOUR::SrcQuality _src_quality;
Editing::ImportPosition _import_position;
}; };
class SoundFileBrowser : public ArdourWindow class SoundFileBrowser : public ArdourWindow
@ -316,6 +318,7 @@ class SoundFileOmega : public SoundFileBrowser
void reset_options_noret (); void reset_options_noret ();
bool bad_file_message (); bool bad_file_message ();
void src_combo_changed (); void src_combo_changed ();
void where_combo_changed ();
void do_something (int action); void do_something (int action);
}; };

1
libs/ardour/ardour/auditioner.h
View file

@ -136,6 +136,7 @@ class LIBARDOUR_API Auditioner : public Track
static void *_drop_ports (void *); static void *_drop_ports (void *);
void actually_drop_ports (); void actually_drop_ports ();
void output_changed (IOChange, void*); void output_changed (IOChange, void*);
frameoffset_t _import_position;
}; };
}; /* namespace ARDOUR */ }; /* namespace ARDOUR */

11
libs/ardour/auditioner.cc
View file

@ -53,6 +53,7 @@ Auditioner::Auditioner (Session& s)
, _synth_added (false) , _synth_added (false)
, _synth_changed (false) , _synth_changed (false)
, _queue_panic (false) , _queue_panic (false)
, _import_position (0)
{ {
} }
@ -370,6 +371,7 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
_synth_added = false; _synth_added = false;
} }
midi_region.reset(); midi_region.reset();
_import_position = 0;
/* copy it */ /* copy it */
the_region = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (region)); the_region = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (region));
@ -399,13 +401,14 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
_midi_audition = true; _midi_audition = true;
set_diskstream(_diskstream_midi); set_diskstream(_diskstream_midi);
the_region.reset(); the_region.reset();
_import_position = region->position();
/* copy it */ /* copy it */
midi_region = (boost::dynamic_pointer_cast<MidiRegion> (RegionFactory::create (region))); midi_region = (boost::dynamic_pointer_cast<MidiRegion> (RegionFactory::create (region)));
midi_region->set_position (0); midi_region->set_position (_import_position);
_diskstream->playlist()->drop_regions (); _diskstream->playlist()->drop_regions ();
_diskstream->playlist()->add_region (midi_region, 0, 1); _diskstream->playlist()->add_region (midi_region, _import_position, 1);
midi_diskstream()->reset_tracker(); midi_diskstream()->reset_tracker();
ProcessorStreams ps; ProcessorStreams ps;
@ -457,7 +460,7 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
if (_midi_audition) { if (_midi_audition) {
length = midi_region->length(); length = midi_region->length();
offset = midi_region->sync_offset (dir); offset = _import_position + midi_region->sync_offset (dir);
} else { } else {
length = the_region->length(); length = the_region->length();
offset = the_region->sync_offset (dir); offset = the_region->sync_offset (dir);
@ -527,7 +530,7 @@ Auditioner::play_audition (framecnt_t nframes)
} }
if (!_seeking) { if (!_seeking) {
AuditionProgress(current_frame, length); /* emit */ AuditionProgress(current_frame - _import_position, length); /* emit */
} }
if (current_frame >= length) { if (current_frame >= length) {