#include "ardour/session.h"
#include "ardour/profile.h"
-#include "gtkmm2ext/choice.h"
#include "gtkmm2ext/treeutils.h"
#include "gtkmm2ext/utils.h"
+#include "widgets/choice.h"
+#include "widgets/tooltips.h"
+
#include "audio_clock.h"
#include "editor.h"
#include "editing.h"
+#include "editing_convert.h"
#include "keyboard.h"
#include "ardour_ui.h"
#include "gui_thread.h"
#include "editor_regions.h"
#include "editor_drag.h"
#include "main_clock.h"
-#include "tooltips.h"
#include "ui_config.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
+using namespace ArdourWidgets;
using namespace ARDOUR_UI_UTILS;
using namespace PBD;
using namespace Gtk;
using Gtkmm2ext::Keyboard;
struct ColumnInfo {
- int index;
- const char* label;
- const char* tooltip;
+ int index;
+ const char* label;
+ const char* tooltip;
};
EditorRegions::EditorRegions (Editor* e)
, _show_automatic_regions (true)
, ignore_region_list_selection_change (false)
, ignore_selected_region_change (false)
- , _no_redisplay (false)
+ , _no_redisplay (false)
, _sort_type ((Editing::RegionListSortType) 0)
, expanded (false)
{
_model->set_sort_column (0, SORT_ASCENDING);
/* column widths */
- int bbt_width, sync_width, check_width, height;
+ int bbt_width, check_width, height;
Glib::RefPtr<Pango::Layout> layout = _display.create_pango_layout (X_("000|000|000"));
Gtkmm2ext::get_pixel_size (layout, bbt_width, height);
- layout = _display.create_pango_layout (X_("Start "));
- Gtkmm2ext::get_pixel_size (layout, sync_width, height);
-
check_width = 20;
TreeViewColumn* col_name = manage (new TreeViewColumn ("", _columns.name));
col_length->set_fixed_width (bbt_width);
col_length->set_sizing (TREE_VIEW_COLUMN_FIXED);
TreeViewColumn* col_sync = manage (new TreeViewColumn ("", _columns.sync));
- col_sync->set_fixed_width (sync_width);
+ col_sync->set_fixed_width (bbt_width);
col_sync->set_sizing (TREE_VIEW_COLUMN_FIXED);
TreeViewColumn* col_fadein = manage (new TreeViewColumn ("", _columns.fadein));
col_fadein->set_fixed_width (bbt_width);
row[_columns.region] = region;
region_row_map.insert(pair<boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::RowReference>(region, TreeRowReference(_model, TreePath (row))) );
-
- populate_row(region, (*row));
+ PropertyChange pc;
+ populate_row(region, (*row), pc);
}
void
return;
}
- prompt = _("Do you really want to remove unused regions?"
- "\n(This is destructive and cannot be undone)");
+ prompt = _("Do you really want to remove unused regions?"
+ "\n(This is destructive and cannot be undone)");
choices.push_back (_("No, do nothing."));
choices.push_back (_("Yes, remove."));
- Gtkmm2ext::Choice prompter (_("Remove unused regions"), prompt, choices);
+ ArdourWidgets::Choice prompter (_("Remove unused regions"), prompt, choices);
if (prompter.run () == 1) {
_no_redisplay = true;
our_interests.add (ARDOUR::Properties::position);
our_interests.add (ARDOUR::Properties::length);
our_interests.add (ARDOUR::Properties::start);
+ our_interests.add (ARDOUR::Properties::sync_position);
our_interests.add (ARDOUR::Properties::locked);
our_interests.add (ARDOUR::Properties::position_lock_style);
our_interests.add (ARDOUR::Properties::muted);
our_interests.add (ARDOUR::Properties::fade_out_active);
if (what_changed.contains (our_interests)) {
-
if (last_row != 0) {
TreeModel::iterator j = _model->get_iter (last_row.get_path());
boost::shared_ptr<Region> c = (*j)[_columns.region];
if (c == r) {
- populate_row (r, (*j));
+ populate_row (r, (*j), what_changed);
if (what_changed.contains (ARDOUR::Properties::hidden)) {
redisplay ();
boost::shared_ptr<Region> c = (*j)[_columns.region];
if (c == r) {
- populate_row (r, (*j));
+ populate_row (r, (*j), what_changed);
if (what_changed.contains (ARDOUR::Properties::hidden)) {
redisplay ();
it = region_row_map.find (region);
if (it != region_row_map.end()){
-
+ PropertyChange c;
TreeModel::iterator j = _model->get_iter ((*it).second.get_path());
- populate_row(region, (*j));
+ populate_row(region, (*j), c);
}
}
boost::shared_ptr<Region> region = (*j)[_columns.region];
if (!region->automatic()) {
- populate_row(region, (*j));
+ PropertyChange c;
+ populate_row(region, (*j), c);
}
}
}
}
void
-EditorRegions::populate_row (boost::shared_ptr<Region> region, TreeModel::Row const &row)
+EditorRegions::populate_row (boost::shared_ptr<Region> region, TreeModel::Row const &row, PBD::PropertyChange const &what_changed)
{
boost::shared_ptr<AudioRegion> audioregion = boost::dynamic_pointer_cast<AudioRegion>(region);
//uint32_t used = _session->playlists->region_use_count (region);
/* Presently a region is only used once so let's save on the sequential scan to determine use count */
uint32_t used = 1;
- populate_row_position (region, row, used);
- populate_row_end (region, row, used);
- populate_row_sync (region, row, used);
- populate_row_fade_in (region, row, used, audioregion);
- populate_row_fade_out (region, row, used, audioregion);
- populate_row_locked (region, row, used);
- populate_row_glued (region, row, used);
- populate_row_muted (region, row, used);
- populate_row_opaque (region, row, used);
- populate_row_length (region, row);
- populate_row_source (region, row);
- populate_row_name (region, row);
- populate_row_used (region, row, used);
+ PropertyChange c;
+ const bool all = what_changed == c;
+
+ if (all || what_changed.contains (Properties::position)) {
+ populate_row_position (region, row, used);
+ }
+ if (all || what_changed.contains (Properties::start) || what_changed.contains (Properties::sync_position)) {
+ populate_row_sync (region, row, used);
+ }
+ if (all || what_changed.contains (Properties::fade_in)) {
+ populate_row_fade_in (region, row, used, audioregion);
+ }
+ if (all || what_changed.contains (Properties::fade_out)) {
+ populate_row_fade_out (region, row, used, audioregion);
+ }
+ if (all || what_changed.contains (Properties::locked)) {
+ populate_row_locked (region, row, used);
+ }
+ if (all || what_changed.contains (Properties::position_lock_style)) {
+ populate_row_glued (region, row, used);
+ }
+ if (all || what_changed.contains (Properties::muted)) {
+ populate_row_muted (region, row, used);
+ }
+ if (all || what_changed.contains (Properties::opaque)) {
+ populate_row_opaque (region, row, used);
+ }
+ if (all || what_changed.contains (Properties::length)) {
+ populate_row_end (region, row, used);
+ populate_row_length (region, row);
+ }
+ if (all) {
+ populate_row_source (region, row);
+ }
+ if (all || what_changed.contains (Properties::name)) {
+ populate_row_name (region, row);
+ }
+ if (all) {
+ populate_row_used (region, row, used);
+ }
}
#if 0
EditorRegions::populate_row_length (boost::shared_ptr<Region> region, TreeModel::Row const &row)
{
char buf[16];
- format_position (region->length(), buf, sizeof (buf));
+
+ if (ARDOUR_UI::instance()->secondary_clock->mode () == AudioClock::BBT) {
+ TempoMap& map (_session->tempo_map());
+ Timecode::BBT_Time bbt = map.bbt_at_beat (map.beat_at_frame (region->last_frame()) - map.beat_at_frame (region->first_frame()));
+ snprintf (buf, sizeof (buf), "%03d|%02d|%04d" , bbt.bars, bbt.beats, bbt.ticks);
+ } else {
+ format_position (region->length(), buf, sizeof (buf));
+ }
+
row[_columns.length] = buf;
}
void
EditorRegions::populate_row_source (boost::shared_ptr<Region> region, TreeModel::Row const &row)
{
- if (boost::dynamic_pointer_cast<SilentFileSource>(region->source())) {
+ if (boost::dynamic_pointer_cast<SilentFileSource>(region->source())) {
row[_columns.path] = _("MISSING ") + Gtkmm2ext::markup_escape_text (region->source()->name());
} else {
row[_columns.path] = Gtkmm2ext::markup_escape_text (region->source()->name());
{
if (f) {
_display.expand_all ();
- expanded = true;
+ expanded = true;
} else {
_display.collapse_all ();
- expanded = false;
+ expanded = false;
}
}
void
EditorRegions::drag_data_received (const RefPtr<Gdk::DragContext>& context,
- int x, int y,
- const SelectionData& data,
- guint info, guint time)
+ int x, int y,
+ const SelectionData& data,
+ guint info, guint time)
{
vector<string> paths;
bool copy = ((context->get_actions() & (Gdk::ACTION_COPY | Gdk::ACTION_LINK | Gdk::ACTION_MOVE)) == Gdk::ACTION_COPY);
if (UIConfiguration::instance().get_only_copy_imported_files() || copy) {
- _editor->do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsRegion, SrcBest, pos);
+ _editor->do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsRegion,
+ SrcBest, SMFTrackName, SMFTempoIgnore, pos);
} else {
_editor->do_embed (paths, Editing::ImportDistinctFiles, ImportAsRegion, pos);
}
{
XMLNode* node = new XMLNode (X_("RegionList"));
- node->add_property (X_("sort-type"), enum_2_string (_sort_type));
+ node->set_property (X_("sort-type"), _sort_type);
RefPtr<Action> act = ActionManager::get_action (X_("RegionList"), X_("SortAscending"));
bool const ascending = RefPtr<RadioAction>::cast_dynamic(act)->get_active ();
- node->add_property (X_("sort-ascending"), ascending ? "yes" : "no");
- node->add_property (X_("show-all"), toggle_full_action()->get_active() ? "yes" : "no");
- node->add_property (X_("show-automatic-regions"), _show_automatic_regions ? "yes" : "no");
+ node->set_property (X_("sort-ascending"), ascending);
+ node->set_property (X_("show-all"), toggle_full_action()->get_active());
+ node->set_property (X_("show-automatic-regions"), _show_automatic_regions);
return *node;
}
return;
}
- XMLProperty const * p = node.property (X_("sort-type"));
-
- if (p) {
- Editing::RegionListSortType const t = static_cast<Editing::RegionListSortType> (string_2_enum (p->value(), _sort_type));
+ Editing::RegionListSortType t;
+ if (node.get_property (X_("sort-type"), t)) {
if (_sort_type != t) {
changed = true;
ract->set_active ();
}
- p = node.property (X_("sort-ascending"));
-
- if (p) {
- bool const yn = string_is_affirmative (p->value ());
+ bool yn;
+ if (node.get_property (X_("sort-ascending"), yn)) {
SortType old_sort_type;
int old_sort_column;
RefPtr<RadioAction>::cast_dynamic(act)->set_active ();
}
- p = node.property (X_("show-all"));
- if (p) {
- bool const yn = string_is_affirmative (p->value ());
-
+ if (node.get_property (X_("show-all"), yn)) {
if (expanded != yn) {
changed = true;
}
toggle_full_action()->set_active (yn);
}
- p = node.property (X_("show-automatic-regions"));
- if (p) {
- bool const yn = string_is_affirmative (p->value ());
-
+ if (node.get_property (X_("show-automatic-regions"), yn)) {
if (yn != _show_automatic_regions) {
_show_automatic_regions = yn;
toggle_show_auto_regions_action()->set_active (yn);