#include <pbd/basename.h>
#include <ardour/audioregion.h>
+#include <ardour/audiofilesource.h>
#include <ardour/session_region.h>
#include <gtkmm2ext/stop_signal.h>
using namespace sigc;
using namespace ARDOUR;
+using namespace PBD;
using namespace Gtk;
using namespace Glib;
using namespace Editing;
void
-Editor::handle_audio_region_removed (AudioRegion* ignored)
+Editor::handle_region_removed (boost::weak_ptr<Region> wregion)
{
+ ENSURE_GUI_THREAD (mem_fun (*this, &Editor::redisplay_regions));
redisplay_regions ();
}
void
-Editor::handle_new_audio_region (AudioRegion *region)
+Editor::handle_new_region (boost::weak_ptr<Region> wregion)
{
+ ENSURE_GUI_THREAD (bind (mem_fun (*this, &Editor::handle_new_region), wregion));
+
/* don't copy region - the one we are being notified
about belongs to the session, and so it will
never be edited.
*/
- add_audio_region_to_region_display (region);
+
+ boost::shared_ptr<Region> region (wregion.lock());
+
+ if (region) {
+ add_region_to_region_display (region);
+ }
}
void
-Editor::region_hidden (Region* r)
+Editor::region_hidden (boost::shared_ptr<Region> r)
{
ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::region_hidden), r));
}
void
-Editor::add_audio_region_to_region_display (AudioRegion *region)
+Editor::add_region_to_region_display (boost::shared_ptr<Region> region)
{
string str;
TreeModel::Row row;
parent = *(region_list_model->append());
parent[region_list_columns.name] = _("Hidden");
- parent[region_list_columns.region] = 0;
+ boost::shared_ptr<Region> proxy = parent[region_list_columns.region];
+ proxy.reset ();
} else {
parent = *(region_list_model->insert(iter));
parent[region_list_columns.name] = _("Hidden");
- parent[region_list_columns.region] = 0;
+ boost::shared_ptr<Region> proxy = parent[region_list_columns.region];
+ proxy.reset ();
} else {
parent = *iter;
} else if (region->whole_file()) {
row = *(region_list_model->append());
- set_color(c, 65535, 0, 0);
+ set_color(c, rgba_from_style ("RegionListWholeFile", 0xff, 0, 0, 0, "fg", Gtk::STATE_NORMAL, false ));
row[region_list_columns.color_] = c;
- if (region->source().name()[0] == '/') { // external file
+ if (region->source()->name()[0] == '/') { // external file
if (region->whole_file()) {
str = ".../";
- str += PBD::basename_nosuffix (region->source().name());
-
+
+ boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(region->source());
+
+ if (afs) {
+ str += region_name_from_path (afs->path(), region->n_channels() > 1);
+ } else {
+ str += region->source()->name();
+ }
+
} else {
str = region->name();
}
for (i = rows.begin(); i != rows.end(); ++i) {
- Region* rr = (*i)[region_list_columns.region];
- AudioRegion* r = dynamic_cast<AudioRegion*>(rr);
+ boost::shared_ptr<Region> rr = (*i)[region_list_columns.region];
+ boost::shared_ptr<AudioRegion> r = boost::dynamic_pointer_cast<AudioRegion>(rr);
if (r && r->whole_file()) {
- if (region->source_equivalent (*r)) {
+ if (region->source_equivalent (r)) {
row = *(region_list_model->append ((*i).children()));
found_parent = true;
break;
*/
if ((iter = region_list_model->get_iter (*i))) {
- set_selected_regionview_from_region_list (*((*iter)[region_list_columns.region]), false);
+ set_selected_regionview_from_region_list (((*iter)[region_list_columns.region]), Selection::Set);
}
}
}
void
-Editor::insert_into_tmp_audio_regionlist(AudioRegion* region)
+Editor::insert_into_tmp_regionlist(boost::shared_ptr<Region> region)
{
/* keep all whole files at the beginning */
if (region->whole_file()) {
- tmp_audio_region_list.push_front (region);
+ tmp_region_list.push_front (region);
} else {
- tmp_audio_region_list.push_back (region);
+ tmp_region_list.push_back (region);
}
}
sorting.
*/
- tmp_audio_region_list.clear();
- session->foreach_audio_region (this, &Editor::insert_into_tmp_audio_regionlist);
+ tmp_region_list.clear();
+ session->foreach_region (this, &Editor::insert_into_tmp_regionlist);
- for (list<AudioRegion*>::iterator r = tmp_audio_region_list.begin(); r != tmp_audio_region_list.end(); ++r) {
- add_audio_region_to_region_display (*r);
+ for (list<boost::shared_ptr<Region> >::iterator r = tmp_region_list.begin(); r != tmp_region_list.end(); ++r) {
+ add_region_to_region_display (*r);
}
+ tmp_region_list.clear();
region_list_display.set_model (region_list_model);
}
}
-void
-Editor::region_list_clear ()
-{
- region_list_model->clear();
-}
-
void
Editor::build_region_list_menu ()
{
bool
Editor::region_list_display_button_press (GdkEventButton *ev)
{
- Region* region;
+ boost::shared_ptr<Region> region;
TreeIter iter;
TreeModel::Path path;
TreeViewColumn* column;
}
}
- if (region == 0) {
- return false;
- }
-
- if (Keyboard::is_delete_event (ev)) {
- session->remove_region_from_region_list (*region);
- return true;
- }
-
if (Keyboard::is_context_menu_event (ev)) {
show_region_list_display_context_menu (ev->button, ev->time);
return true;
}
+ if (region == 0) {
+ return false;
+ }
+
switch (ev->button) {
case 1:
/* audition on double click */
if (ev->type == GDK_2BUTTON_PRESS) {
- consider_auditioning (*region);
+ consider_auditioning (region);
return true;
}
return false;
case 2:
if (!Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
- consider_auditioning (*region);
+ consider_auditioning (region);
}
return true;
break;
TreeViewColumn* column;
int cellx;
int celly;
- Region* region = 0;
+ boost::shared_ptr<Region> region;
if (region_list_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
if ((iter = region_list_model->get_iter (path))) {
}
if (region && Keyboard::is_delete_event (ev)) {
- session->remove_region_from_region_list (*region);
+ session->remove_region_from_region_list (region);
return true;
}
}
void
-Editor::consider_auditioning (Region& region)
+Editor::consider_auditioning (boost::shared_ptr<Region> region)
{
- AudioRegion* r = dynamic_cast<AudioRegion*> (®ion);
+ boost::shared_ptr<AudioRegion> r = boost::dynamic_pointer_cast<AudioRegion> (region);
if (r == 0) {
session->cancel_audition ();
}
}
- session->audition_region (*r);
+ session->audition_region (r);
last_audition_region = r;
}
{
int cmp = 0;
- Region* r1 = (*a)[region_list_columns.region];
- Region* r2 = (*b)[region_list_columns.region];
+ boost::shared_ptr<Region> r1 = (*a)[region_list_columns.region];
+ boost::shared_ptr<Region> r2 = (*b)[region_list_columns.region];
/* handle rows without regions, like "Hidden" */
return 1;
}
- AudioRegion* region1 = dynamic_cast<AudioRegion*> (r1);
- AudioRegion* region2 = dynamic_cast<AudioRegion*> (r2);
+ boost::shared_ptr<AudioRegion> region1 = boost::dynamic_pointer_cast<AudioRegion> (r1);
+ boost::shared_ptr<AudioRegion> region2 = boost::dynamic_pointer_cast<AudioRegion> (r2);
if (region1 == 0 || region2 == 0) {
Glib::ustring s1;
break;
case ByTimestamp:
- cmp = region1->source().timestamp() - region2->source().timestamp();
+ cmp = region1->source()->timestamp() - region2->source()->timestamp();
break;
case ByStartInFile:
break;
case BySourceFileName:
- cmp = strcasecmp (region1->source().name().c_str(), region2->source().name().c_str());
+ cmp = strcasecmp (region1->source()->name().c_str(), region2->source()->name().c_str());
break;
case BySourceFileLength:
- cmp = region1->source().length() - region2->source().length();
+ cmp = region1->source()->length() - region2->source()->length();
break;
case BySourceFileCreationDate:
- cmp = region1->source().timestamp() - region2->source().timestamp();
+ cmp = region1->source()->timestamp() - region2->source()->timestamp();
break;
case BySourceFileFS:
- if (region1->source().name() == region2->source().name()) {
+ if (region1->source()->name() == region2->source()->name()) {
cmp = strcasecmp (region1->name().c_str(), region2->name().c_str());
} else {
- cmp = strcasecmp (region1->source().name().c_str(), region2->source().name().c_str());
+ cmp = strcasecmp (region1->source()->name().c_str(), region2->source()->name().c_str());
}
break;
}
}
void
-Editor::region_list_selection_mapover (slot<void,Region&> sl)
+Editor::region_list_selection_mapover (slot<void,boost::shared_ptr<Region> > sl)
{
Glib::RefPtr<TreeSelection> selection = region_list_display.get_selection();
TreeView::Selection::ListHandle_Path rows = selection->get_selected_rows ();
TreeIter iter;
if ((iter = region_list_model->get_iter (*i))) {
- sl (*((*iter)[region_list_columns.region]));
+ sl (((*iter)[region_list_columns.region]));
}
}
}
void
-Editor::hide_a_region (Region& r)
+Editor::hide_a_region (boost::shared_ptr<Region> r)
{
- r.set_hidden (true);
+ r->set_hidden (true);
}
void
-Editor::remove_a_region (Region& r)
+Editor::remove_a_region (boost::shared_ptr<Region> r)
{
+ cerr << "remove " << r->name();
session->remove_region_from_region_list (r);
}
void
Editor::remove_region_from_region_list ()
{
+ cerr << "Mapping remove over region selection\n";
region_list_selection_mapover (mem_fun (*this, &Editor::remove_a_region));
}
const SelectionData& data,
guint info, guint time)
{
- vector<string> paths;
+ vector<ustring> paths;
if (convert_drop_to_paths (paths, context, x, y, data, info, time) == 0) {
- do_embed_sndfiles (paths, false);
+ nframes_t pos = 0;
+ do_embed (paths, false, ImportAsRegion, 0, pos, true);
context->drag_finish (true, false, time);
}
}
{
/* not possible to select rows that do not represent regions, like "Hidden" */
- return (*(model->get_iter (path)))[region_list_columns.region] != 0;
+ /// XXXX FIXME boost::shared_ptr<Region> r = ((model->get_iter (path)))[region_list_columns.region];
+ /// return r != 0;
+ return true;
}
projects / ardour.git / blobdiff