#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);
_display.set_headers_visible (true);
_display.set_rules_hint ();
- /* show path as the row tooltip */
- _display.set_tooltip_column (14); /* path */
+ if (UIConfiguration::instance().get_use_tooltips()) {
+ /* show path as the row tooltip */
+ _display.set_tooltip_column (14); /* path */
+ }
CellRendererText* region_name_cell = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (0));
region_name_cell->property_editable() = true;
// _display.signal_popup_menu().connect (sigc::bind (sigc::mem_fun (*this, &Editor::show__display_context_menu), 1, 0));
//ARDOUR_UI::instance()->secondary_clock.mode_changed.connect (sigc::mem_fun(*this, &Editor::redisplay_regions));
- ARDOUR_UI::instance()->secondary_clock->mode_changed.connect (sigc::mem_fun(*this, &EditorRegions::update_all_rows));
+ ARDOUR_UI::instance()->primary_clock->mode_changed.connect (sigc::mem_fun(*this, &EditorRegions::update_all_rows));
ARDOUR::Region::RegionPropertyChanged.connect (region_property_connection, MISSING_INVALIDATOR, boost::bind (&EditorRegions::region_changed, this, _1, _2), gui_context());
ARDOUR::RegionFactory::CheckNewRegion.connect (check_new_region_connection, MISSING_INVALIDATOR, boost::bind (&EditorRegions::add_region, this, _1), gui_context());
TreeModel::Row row;
Gdk::Color c;
bool missing_source = boost::dynamic_pointer_cast<SilentFileSource>(region->source()) != NULL;
+ TreeModel::iterator iter;
if (!_show_automatic_regions && region->automatic()) {
return;
if (region->hidden()) {
- TreeModel::iterator iter = _model->get_iter ("0");
+ iter = _model->get_iter ("0");
TreeModel::Row parent;
if (!iter) {
}
}
- row = *(_model->append (parent.children()));
+ iter = _model->append (parent.children());
+ row = *iter;
} else if (region->whole_file()) {
}
}
- row = *(_model->append());
+ iter = _model->append();
+ row = *iter;
if (missing_source) {
// c.set_rgb(65535,0,0); // FIXME: error color from style
}
}
- region_row_map.insert(pair<boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::RowReference>(region, TreeRowReference(_model, TreePath (row))) );
+ region_row_map.insert(pair<boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::iterator>(region, iter));
parent_regions_sources_map.insert(pair<string, Gtk::TreeModel::RowReference>(region->source_string(), TreeRowReference(_model, TreePath (row))) );
return;
// find parent node, add as new child
TreeModel::iterator i;
- boost::unordered_map<string, Gtk::TreeModel::RowReference>::iterator it;
+ RegionSourceMap::iterator it;
it = parent_regions_sources_map.find (region->source_string());
}
*/
- row = *(_model->insert (subrows.end()));
+ iter = _model->insert (subrows.end());
+ row = *iter;
} else {
- row = *(_model->append());
+ iter = _model->append();
+ row = *iter;
}
row[_columns.property_toggles_visible] = true;
}
row[_columns.region] = region;
-
- region_row_map.insert(pair<boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::RowReference>(region, TreeRowReference(_model, TreePath (row))) );
+ region_row_map.insert (pair<boost::shared_ptr<ARDOUR::Region>,Gtk::TreeModel::iterator> (region,iter));
PropertyChange pc;
populate_row(region, (*row), pc);
}
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;
void
EditorRegions::region_changed (boost::shared_ptr<Region> r, const PropertyChange& what_changed)
{
+ //maybe update the grid here
+ PropertyChange grid_interests;
+ grid_interests.add (ARDOUR::Properties::position);
+ grid_interests.add (ARDOUR::Properties::length);
+ grid_interests.add (ARDOUR::Properties::sync_position);
+ if (what_changed.contains (grid_interests)) {
+ _editor->mark_region_boundary_cache_dirty();
+ }
+
PropertyChange our_interests;
our_interests.add (ARDOUR::Properties::name);
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);
if (it != region_row_map.end()){
- TreeModel::iterator j = _model->get_iter ((*it).second.get_path());
+ TreeModel::iterator j = it->second;
boost::shared_ptr<Region> c = (*j)[_columns.region];
if (c == r) {
it = region_row_map.find (r);
if (it != region_row_map.end()){
- TreeModel::iterator j = _model->get_iter ((*it).second.get_path());
+ TreeModel::iterator j = it->second;
_display.get_selection()->select(*j);
}
}
_model->clear ();
_model->set_sort_column (-2, SORT_ASCENDING); //Disable sorting to gain performance
-
region_row_map.clear();
parent_regions_sources_map.clear();
if (it != region_row_map.end()){
PropertyChange c;
- TreeModel::iterator j = _model->get_iter ((*it).second.get_path());
+ TreeModel::iterator j = it->second;
populate_row(region, (*j), c);
}
}
for (i = region_row_map.begin(); i != region_row_map.end(); ++i) {
- TreeModel::iterator j = _model->get_iter ((*i).second.get_path());
+ TreeModel::iterator j = i->second;
boost::shared_ptr<Region> region = (*j)[_columns.region];
}
void
-EditorRegions::format_position (framepos_t pos, char* buf, size_t bufsize, bool onoff)
+EditorRegions::format_position (samplepos_t pos, char* buf, size_t bufsize, bool onoff)
{
Timecode::BBT_Time bbt;
Timecode::Time timecode;
return;
}
- switch (ARDOUR_UI::instance()->secondary_clock->mode ()) {
+ switch (ARDOUR_UI::instance()->primary_clock->mode ()) {
case AudioClock::BBT:
- bbt = _session->tempo_map().bbt_at_frame (pos);
+ bbt = _session->tempo_map().bbt_at_sample (pos);
if (onoff) {
snprintf (buf, bufsize, "%03d|%02d|%04d" , bbt.bars, bbt.beats, bbt.ticks);
} else {
break;
case AudioClock::MinSec:
- framepos_t left;
+ samplepos_t left;
int hrs;
int mins;
float secs;
left = pos;
- hrs = (int) floor (left / (_session->frame_rate() * 60.0f * 60.0f));
- left -= (framecnt_t) floor (hrs * _session->frame_rate() * 60.0f * 60.0f);
- mins = (int) floor (left / (_session->frame_rate() * 60.0f));
- left -= (framecnt_t) floor (mins * _session->frame_rate() * 60.0f);
- secs = left / (float) _session->frame_rate();
+ hrs = (int) floor (left / (_session->sample_rate() * 60.0f * 60.0f));
+ left -= (samplecnt_t) floor (hrs * _session->sample_rate() * 60.0f * 60.0f);
+ mins = (int) floor (left / (_session->sample_rate() * 60.0f));
+ left -= (samplecnt_t) floor (mins * _session->sample_rate() * 60.0f);
+ secs = left / (float) _session->sample_rate();
if (onoff) {
snprintf (buf, bufsize, "%02d:%02d:%06.3f", hrs, mins, secs);
} else {
}
break;
- case AudioClock::Frames:
+ case AudioClock::Seconds:
+ if (onoff) {
+ snprintf (buf, bufsize, "%.1f", pos / (float)_session->sample_rate());
+ } else {
+ snprintf (buf, bufsize, "(%.1f)", pos / (float)_session->sample_rate());
+ }
+ break;
+
+ case AudioClock::Samples:
if (onoff) {
snprintf (buf, bufsize, "%" PRId64, pos);
} else {
if (all || what_changed.contains (Properties::position)) {
populate_row_position (region, row, used);
}
- if (all || what_changed.contains (Properties::start)) {
+ 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)) {
#if 0
if (audioRegion && fades_in_seconds) {
- framepos_t left;
+ samplepos_t left;
int mins;
int millisecs;
left = audioRegion->fade_in()->back()->when;
- mins = (int) floor (left / (_session->frame_rate() * 60.0f));
- left -= (framepos_t) floor (mins * _session->frame_rate() * 60.0f);
- millisecs = (int) floor ((left * 1000.0f) / _session->frame_rate());
+ mins = (int) floor (left / (_session->sample_rate() * 60.0f));
+ left -= (samplepos_t) floor (mins * _session->sample_rate() * 60.0f);
+ millisecs = (int) floor ((left * 1000.0f) / _session->sample_rate());
- if (audioRegion->fade_in()->back()->when >= _session->frame_rate()) {
+ if (audioRegion->fade_in()->back()->when >= _session->sample_rate()) {
sprintf (fadein_str, "%01dM %01dmS", mins, millisecs);
} else {
sprintf (fadein_str, "%01dmS", millisecs);
}
left = audioRegion->fade_out()->back()->when;
- mins = (int) floor (left / (_session->frame_rate() * 60.0f));
- left -= (framepos_t) floor (mins * _session->frame_rate() * 60.0f);
- millisecs = (int) floor ((left * 1000.0f) / _session->frame_rate());
+ mins = (int) floor (left / (_session->sample_rate() * 60.0f));
+ left -= (samplepos_t) floor (mins * _session->sample_rate() * 60.0f);
+ millisecs = (int) floor ((left * 1000.0f) / _session->sample_rate());
- if (audioRegion->fade_out()->back()->when >= _session->frame_rate()) {
+ if (audioRegion->fade_out()->back()->when >= _session->sample_rate()) {
sprintf (fadeout_str, "%01dM %01dmS", mins, millisecs);
} else {
sprintf (fadeout_str, "%01dmS", millisecs);
{
char buf[16];
- if (ARDOUR_UI::instance()->secondary_clock->mode () == AudioClock::BBT) {
+ if (ARDOUR_UI::instance()->primary_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()));
+ Timecode::BBT_Time bbt = map.bbt_at_beat (map.beat_at_sample (region->last_sample()) - map.beat_at_sample (region->first_sample()));
snprintf (buf, sizeof (buf), "%03d|%02d|%04d" , bbt.bars, bbt.beats, bbt.ticks);
} else {
format_position (region->length(), buf, sizeof (buf));
row[_columns.end] = "";
} else if (used > 1) {
row[_columns.end] = _("Mult.");
- } else if (region->last_frame() >= region->first_frame()) {
+ } else if (region->last_sample() >= region->first_sample()) {
char buf[16];
- format_position (region->last_frame(), buf, sizeof (buf));
+ format_position (region->last_sample(), buf, sizeof (buf));
row[_columns.end] = buf;
} else {
row[_columns.end] = "empty";
} else {
if (region->sync_position() == region->position()) {
row[_columns.sync] = _("Start");
- } else if (region->sync_position() == (region->last_frame())) {
+ } else if (region->sync_position() == (region->last_sample())) {
row[_columns.sync] = _("End");
} else {
char buf[16];
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;
}
if (_editor->convert_drop_to_paths (paths, context, x, y, data, info, time) == 0) {
- framepos_t pos = 0;
+ samplepos_t pos = 0;
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);
projects / ardour.git / blobdiff