*/
+#ifdef WAF_BUILD
+#include "gtk2ardour-config.h"
+#endif
+
#include <map>
#include <cerrno>
#include <sstream>
using namespace Gtkmm2ext;
using namespace Editing;
-using Glib::ustring;
+using std::string;
-ustring SoundFileBrowser::persistent_folder;
+string SoundFileBrowser::persistent_folder;
static ImportMode
string2importmode (string str)
}
SoundFileBox::SoundFileBox (bool persistent)
- : _session(0),
- table (6, 2),
+ : table (6, 2),
length_clock ("sfboxLengthClock", !persistent, "EditCursorClock", false, false, true, false),
timecode_clock ("sfboxTimecodeClock", !persistent, "EditCursorClock", false, false, false, false),
main_box (false, 6),
samplerate.set_text (_("Sample rate:"));
samplerate.set_alignment (1, 0.5);
- format_text.set_max_width_chars (8);
+ preview_label.set_max_width_chars (50);
+ preview_label.set_ellipsize (Pango::ELLIPSIZE_END);
+
+ format_text.set_max_width_chars (20);
format_text.set_ellipsize (Pango::ELLIPSIZE_END);
format_text.set_alignment (0, 1);
void
SoundFileBox::set_session(Session* s)
{
- _session = s;
+ SessionHandlePtr::set_session (s);
+
+ length_clock.set_session (s);
+ timecode_clock.set_session (s);
if (!_session) {
play_btn.set_sensitive (false);
stop_btn.set_sensitive (false);
}
-
-
- length_clock.set_session (s);
- timecode_clock.set_session (s);
}
bool
-SoundFileBox::setup_labels (const ustring& filename)
+SoundFileBox::setup_labels (const string& filename)
{
if (!path.empty()) {
// save existing tags
samplerate.set_name ("NewSessionSR2Label");
}
- nframes_t const nfr = _session ? _session->nominal_frame_rate() : 25;
+ framecnt_t const nfr = _session ? _session->nominal_frame_rate() : 25;
double src_coef = (double) nfr / sf_info.samplerate;
length_clock.set (sf_info.length * src_coef + 0.5, true);
return;
}
+ if (SMFSource::safe_midi_file_extension (path)) {
+ error << _("Auditioning of MIDI files is not yet supported") << endmsg;
+ return;
+ }
+
_session->cancel_audition();
if (!Glib::file_test (path, Glib::FILE_TEST_EXISTS)) {
afs = boost::dynamic_pointer_cast<AudioFileSource> (srclist[0]);
string rname = region_name_from_path (afs->path(), false);
- r = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (srclist, 0,
- srclist[0]->length(srclist[0]->timeline_position()),
- rname, 0, Region::DefaultFlags, false));
+
+ PropertyList plist;
+
+ plist.add (ARDOUR::Properties::start, 0);
+ plist.add (ARDOUR::Properties::length, srclist[0]->length(srclist[0]->timeline_position()));
+ plist.add (ARDOUR::Properties::name, rname);
+ plist.add (ARDOUR::Properties::layer, 0);
+
+ r = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (srclist, plist, false));
_session->audition_region(r);
}
resetting_ourselves = false;
gm = 0;
- if (ARDOUR::Profile->get_sae()) {
- chooser.add_shortcut_folder_uri("file:///Library/GarageBand/Apple Loops");
- chooser.add_shortcut_folder_uri("file:///Library/Application Support/GarageBand/Instrument Library/Sampler/Sampler Files");
- }
-
+#ifdef GTKOSX
+ chooser.add_shortcut_folder_uri("file:///Library/GarageBand/Apple Loops");
+ chooser.add_shortcut_folder_uri("file:///Library/Audio/Apple Loops");
+ chooser.add_shortcut_folder_uri("file:///Library/Application Support/GarageBand/Instrument Library/Sampler/Sampler Files");
+
+ chooser.add_shortcut_folder_uri("file:///Volumes");
+#endif
//add the file chooser
{
chooser.set_select_multiple (true);
chooser.signal_update_preview().connect(sigc::mem_fun(*this, &SoundFileBrowser::update_preview));
chooser.signal_file_activated().connect (sigc::mem_fun (*this, &SoundFileBrowser::chooser_file_activated));
+#ifdef GTKOSX
+ /* some broken redraw behaviour - this is a bandaid */
+ chooser.signal_selection_changed().connect (mem_fun (chooser, &Widget::queue_draw));
+#endif
if (!persistent_folder.empty()) {
chooser.set_current_folder (persistent_folder);
{
ArdourDialog::set_session (s);
preview.set_session (s);
- if (s) {
+
+ if (_session) {
add_gain_meter ();
} else {
remove_gain_meter ();
{
delete gm;
- gm = new GainMeter (*session, 250);
+ gm = new GainMeter (_session, 250);
- boost::shared_ptr<Route> r = session->the_auditioner ();
+ boost::shared_ptr<Route> r = _session->the_auditioner ();
gm->set_controls (r, r->shared_peak_meter(), r->amp());
void
SoundFileBrowser::meter ()
{
- if (is_mapped () && session && gm) {
+ if (is_mapped () && _session && gm) {
gm->update_meters ();
}
}
if (!reset_options ()) {
set_response_sensitive (RESPONSE_OK, false);
} else {
- ustring file;
+ string file;
TreeView::Selection::ListHandle_Path rows = found_list_view.get_selection()->get_selected_rows ();
if (!reset_options ()) {
set_response_sensitive (RESPONSE_OK, false);
} else {
- ustring file;
+ string file;
TreeView::Selection::ListHandle_Path rows = freesound_list_view.get_selection()->get_selected_rows ();
}
-vector<ustring>
+vector<string>
SoundFileBrowser::get_paths ()
{
- vector<ustring> results;
+ vector<string> results;
int n = notebook.get_current_page ();
if (n == 0) {
- vector<ustring> filenames = chooser.get_filenames();
- vector<ustring>::iterator i;
+ vector<string> filenames = chooser.get_filenames();
+ vector<string>::iterator i;
for (i = filenames.begin(); i != filenames.end(); ++i) {
struct stat buf;
ListPath rows = found_list_view.get_selection()->get_selected_rows ();
for (ListPath::iterator i = rows.begin() ; i != rows.end(); ++i) {
TreeIter iter = found_list->get_iter(*i);
- ustring str = (*iter)[found_list_columns.pathname];
+ string str = (*iter)[found_list_columns.pathname];
results.push_back (str);
}
ListPath rows = freesound_list_view.get_selection()->get_selected_rows ();
for (ListPath::iterator i = rows.begin() ; i != rows.end(); ++i) {
TreeIter iter = freesound_list->get_iter(*i);
- ustring str = (*iter)[freesound_list_columns.pathname];
+ string str = (*iter)[freesound_list_columns.pathname];
results.push_back (str);
}
bool
SoundFileOmega::reset_options ()
{
- vector<ustring> paths = get_paths ();
+ vector<string> paths = get_paths ();
if (paths.empty()) {
bool same_size;
bool src_needed;
bool selection_includes_multichannel;
- bool selection_can_be_embedded_with_links = check_link_status (*session, paths);
+ bool selection_can_be_embedded_with_links = check_link_status (_session, paths);
ImportMode mode;
if (check_info (paths, same_size, src_needed, selection_includes_multichannel)) {
return false;
}
- ustring existing_choice;
+ string existing_choice;
vector<string> action_strings;
if (selected_track_cnt > 0) {
channel_strings.push_back (_("sequence files"));
}
if (same_size) {
- channel_strings.push_back (_("all files in one region"));
+ channel_strings.push_back (_("all files in one track"));
+ channel_strings.push_back (_("merge files"));
}
}
}
}
+ resetting_ourselves = true;
+
existing_choice = channel_combo.get_active_text();
set_popdown_strings (channel_combo, channel_strings);
channel_combo.set_active_text (channel_strings.front());
}
+ resetting_ourselves = false;
+
if (src_needed) {
src_combo.set_sensitive (true);
} else {
SoundFileOmega::bad_file_message()
{
MessageDialog msg (*this,
- _("One or more of the selected files\ncannot be used by Ardour"),
+ string_compose (_("One or more of the selected files\ncannot be used by %1"), PROGRAM_NAME),
true,
Gtk::MESSAGE_INFO,
Gtk::BUTTONS_OK);
}
bool
-SoundFileOmega::check_info (const vector<ustring>& paths, bool& same_size, bool& src_needed, bool& multichannel)
+SoundFileOmega::check_info (const vector<string>& paths, bool& same_size, bool& src_needed, bool& multichannel)
{
SoundFileInfo info;
- nframes64_t sz = 0;
+ framepos_t sz = 0;
bool err = false;
string errmsg;
src_needed = false;
multichannel = false;
- for (vector<ustring>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
+ for (vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
if (AudioFileSource::get_soundfile_info (*i, info, errmsg)) {
if (info.channels > 1) {
}
}
- if ((nframes_t) info.samplerate != session->frame_rate()) {
+ if (info.samplerate != _session->frame_rate()) {
src_needed = true;
}
bool
-SoundFileOmega::check_link_status (const Session& s, const vector<ustring>& paths)
+SoundFileOmega::check_link_status (const Session* s, const vector<string>& paths)
{
- sys::path path = s.session_directory().sound_path() / "linktest";
+ sys::path path = s->session_directory().sound_path() / "linktest";
string tmpdir = path.to_string();
bool ret = false;
}
}
- for (vector<ustring>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
+ for (vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
char tmpc[MAXPATHLEN+1];
ArdourDialog::on_hide();
stop_metering ();
- if (session) {
- session->cancel_audition();
+ if (_session) {
+ _session->cancel_audition();
}
}
-ustring
+string
SoundFileChooser::get_filename ()
{
- vector<ustring> paths;
+ vector<string> paths;
paths = get_paths ();
if (paths.empty()) {
- return ustring ();
+ return string ();
}
if (!Glib::file_test (paths.front(), Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) {
- return ustring();
+ return string();
}
return paths.front();
reset_options ();
action_combo.signal_changed().connect (sigc::mem_fun (*this, &SoundFileOmega::reset_options_noret));
+ channel_combo.signal_changed().connect (sigc::mem_fun (*this, &SoundFileOmega::reset_options_noret));
copy_files_btn.set_active (true);
/* setup disposition map */
- disposition_map.insert (pair<ustring,ImportDisposition>(_("one track per file"), ImportDistinctFiles));
- disposition_map.insert (pair<ustring,ImportDisposition>(_("one track per channel"), ImportDistinctChannels));
- disposition_map.insert (pair<ustring,ImportDisposition>(_("merge files"), ImportMergeFiles));
- disposition_map.insert (pair<ustring,ImportDisposition>(_("sequence files"), ImportSerializeFiles));
+ disposition_map.insert (pair<string,ImportDisposition>(_("one track per file"), ImportDistinctFiles));
+ disposition_map.insert (pair<string,ImportDisposition>(_("one track per channel"), ImportDistinctChannels));
+ disposition_map.insert (pair<string,ImportDisposition>(_("merge files"), ImportMergeFiles));
+ disposition_map.insert (pair<string,ImportDisposition>(_("sequence files"), ImportSerializeFiles));
- disposition_map.insert (pair<ustring,ImportDisposition>(_("one region per file"), ImportDistinctFiles));
- disposition_map.insert (pair<ustring,ImportDisposition>(_("one region per channel"), ImportDistinctChannels));
- disposition_map.insert (pair<ustring,ImportDisposition>(_("all files in one region"), ImportMergeFiles));
+ disposition_map.insert (pair<string,ImportDisposition>(_("one region per file"), ImportDistinctFiles));
+ disposition_map.insert (pair<string,ImportDisposition>(_("one region per channel"), ImportDistinctChannels));
+ disposition_map.insert (pair<string,ImportDisposition>(_("all files in one region"), ImportMergeFiles));
+ disposition_map.insert (pair<string,ImportDisposition>(_("all files in one track"), ImportMergeFiles));
chooser.signal_selection_changed().connect (sigc::mem_fun (*this, &SoundFileOmega::file_selection_changed));
SoundFileOmega::on_hide ()
{
ArdourDialog::on_hide();
- if (session) {
- session->cancel_audition();
+ if (_session) {
+ _session->cancel_audition();
}
}
ImportPosition
SoundFileOmega::get_position() const
{
- ustring str = where_combo.get_active_text();
+ string str = where_combo.get_active_text();
if (str == _("file timestamp")) {
return ImportAtTimestamp;
SrcQuality
SoundFileOmega::get_src_quality() const
{
- ustring str = where_combo.get_active_text();
+ string str = where_combo.get_active_text();
if (str == _("Best")) {
return SrcBest;
and the ImportDisposition enum that corresponds to it.
*/
- ustring str = channel_combo.get_active_text();
+ string str = channel_combo.get_active_text();
DispositionMap::const_iterator x = disposition_map.find (str);
if (x == disposition_map.end()) {
projects / ardour.git / blobdiff