diff options
| -rw-r--r-- | gtk2_ardour/actions.cc | 8 | ||||
| -rw-r--r-- | gtk2_ardour/audio_streamview.cc | 9 | ||||
| -rw-r--r-- | gtk2_ardour/editor_canvas.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/audio_diskstream.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 7 | ||||
| -rw-r--r-- | libs/ardour/sndfilesource.cc | 1 | ||||
| -rw-r--r-- | libs/gtkmm2ext/dndtreeview.cc | 7 |
7 files changed, 24 insertions, 12 deletions
diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc index 2197d4dc00..b2408620a5 100644 --- a/gtk2_ardour/actions.cc +++ b/gtk2_ardour/actions.cc @@ -73,13 +73,13 @@ ActionManager::init () ui_manager->add_ui_from_file (ui_file); loaded = true; } catch (Glib::MarkupError& err) { - error << "badly formatted UI definition file" << endmsg; + error << _("badly formatted UI definition file") << endmsg; } catch (...) { - error << "Ardour menu definition file not found" << endmsg; + error << _("Ardour menu definition file not found") << endmsg; } if (!loaded) { - error << "ardour will not work without a valid ardour.menus file" << endmsg; + error << _("ardour will not work without a valid ardour.menus file") << endmsg; exit(1); } } @@ -277,7 +277,7 @@ ActionManager::uncheck_toggleaction (const char * name) RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act); tact->set_active (false); } else { - error << "Unknown action name: " << name << endmsg; + error << string_compose (_("Unknown action name: %1"), name) << endmsg; } delete [] group_name; diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index 9a6f1f25a2..f4adc6f04f 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -504,9 +504,14 @@ AudioStreamView::setup_rec_box () /* remove temp regions */ - for (list<boost::shared_ptr<ARDOUR::Region> >::iterator i = rec_regions.begin(); i != rec_regions.end(); ++i) { - (*i)->drop_references(); + for (list<boost::shared_ptr<Region> >::iterator iter = rec_regions.begin(); iter != rec_regions.end();) { + list<boost::shared_ptr<Region> >::iterator tmp; + tmp = iter; + ++tmp; + (*iter)->drop_references (); + iter = tmp; } + rec_regions.clear(); // cerr << "\tclear " << rec_rects.size() << " rec rects\n"; diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 0c3436ec40..6798242642 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -417,6 +417,8 @@ Editor::track_canvas_drag_data_received (const RefPtr<Gdk::DragContext>& context const SelectionData& data, guint info, guint time) { + cerr << "dropping, target = " << data.get_target() << endl; + if (data.get_target() == "regions") { drop_regions (context, x, y, data, info, time); } else { diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc index 037ffdb30a..f0ea938ca6 100644 --- a/libs/ardour/audio_diskstream.cc +++ b/libs/ardour/audio_diskstream.cc @@ -1581,7 +1581,7 @@ AudioDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_ca string region_name; _session.region_name (region_name, channels[0].write_source->name(), false); - cerr << _name << ": based on ci of " << (*ci)->start << " for " << (*ci)->frames << " add region " << region_name << endl; + // cerr << _name << ": based on ci of " << (*ci)->start << " for " << (*ci)->frames << " add region " << region_name << endl; try { boost::shared_ptr<Region> rx (RegionFactory::create (srcs, buffer_position, (*ci)->frames, region_name)); diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index c7e349d14e..6f7935e9b6 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -2950,7 +2950,7 @@ Session::audio_path_from_name (string name, uint32_t nchan, uint32_t chan, bool spath = (*i).path; - spath += sound_dir_name; + spath += sound_dir (false); if (destructive) { if (nchan < 2) { @@ -2986,9 +2986,10 @@ Session::audio_path_from_name (string name, uint32_t nchan, uint32_t chan, bool } } - if (access (buf, F_OK) == 0) { + if (g_file_test (buf, G_FILE_TEST_EXISTS)) { existing++; - } + } + } if (existing == 0) { diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc index 61ebb153f7..fa3a882aa4 100644 --- a/libs/ardour/sndfilesource.cc +++ b/libs/ardour/sndfilesource.cc @@ -226,7 +226,6 @@ SndFileSource::open () _length = _info.frames; - _broadcast_info = new SF_BROADCAST_INFO; memset (_broadcast_info, 0, sizeof (*_broadcast_info)); diff --git a/libs/gtkmm2ext/dndtreeview.cc b/libs/gtkmm2ext/dndtreeview.cc index d7ee5a7b27..83955861cf 100644 --- a/libs/gtkmm2ext/dndtreeview.cc +++ b/libs/gtkmm2ext/dndtreeview.cc @@ -48,6 +48,8 @@ DnDTreeView::serialize_pointers (RefPtr<TreeModel> model, TreeSelection::ListHan uint32_t cnt = selection->size(); uint32_t sz = (sizeof (void*) * cnt) + sizeof (SerializedObjectPointers); + cerr << "lets plan to serialize " << cnt << " from selection\n"; + char* buf = new char[sz]; SerializedObjectPointers* sr = new (buf) SerializedObjectPointers; @@ -59,10 +61,12 @@ DnDTreeView::serialize_pointers (RefPtr<TreeModel> model, TreeSelection::ListHan cnt = 0; for (TreeSelection::ListHandle_Path::iterator x = selection->begin(); x != selection->end(); ++x, ++cnt) { + cerr << "getting next item\n"; TreeModel::Row row = *(model->get_iter (*x)); row.get_value (data_column, sr->ptr[cnt]); } - + + cerr << "returning an SR with size = " << sr->size << endl; return sr; } @@ -79,6 +83,7 @@ DnDTreeView::on_drag_data_get(const RefPtr<DragContext>& context, SelectionData& SerializedObjectPointers* sr = serialize_pointers (get_model(), &selection, selection_data.get_target()); selection_data.set (8, (guchar*)sr, sr->size); + cerr << "selection data set to contain " << sr->size << endl; } } |