projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add left/right side trim cursors and use them for region trimming, as appropriate
[ardour.git]
/
gtk2_ardour
/
region_selection.cc
diff --git
a/gtk2_ardour/region_selection.cc
b/gtk2_ardour/region_selection.cc
index d1970138c5dde1e345eda16613b772f4c48f9874..9ac96d682ba35db73a54687c48dbe9862593c4f4 100644
(file)
--- a/
gtk2_ardour/region_selection.cc
+++ b/
gtk2_ardour/region_selection.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2006 Paul Davis
+ Copyright (C) 2006 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-18,71
+18,66
@@
#include <algorithm>
#include <algorithm>
-#include
<ardour/region.h>
+#include
"ardour/region.h"
+#include "gui_thread.h"
#include "region_view.h"
#include "region_selection.h"
#include "time_axis_view.h"
#include "region_view.h"
#include "region_selection.h"
#include "time_axis_view.h"
+using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace ARDOUR;
using namespace PBD;
-using namespace sigc;
-/**
- * Construct an empty RegionSelection.
+/** Construct an empty RegionSelection.
*/
*/
-
RegionSelection::RegionSelection ()
{
RegionSelection::RegionSelection ()
{
- RegionView::RegionViewGoingAway.connect (
mem_fun(*this, &RegionSelection::remove_it
));
+ RegionView::RegionViewGoingAway.connect (
death_connection, MISSING_INVALIDATOR, ui_bind (&RegionSelection::remove_it, this, _1), gui_context(
));
_current_start = 0;
_current_end = 0;
}
_current_start = 0;
_current_end = 0;
}
-/**
- * Copy constructor.
+/** Copy constructor.
* @param other RegionSelection to copy.
*/
* @param other RegionSelection to copy.
*/
-
RegionSelection::RegionSelection (const RegionSelection& other)
RegionSelection::RegionSelection (const RegionSelection& other)
+ : std::list<RegionView*>()
{
{
- RegionView::RegionViewGoingAway.connect (mem_fun(*this, &RegionSelection::remove_it));
+ RegionView::RegionViewGoingAway.connect (death_connection, MISSING_INVALIDATOR, ui_bind (&RegionSelection::remove_it, this, _1), gui_context());
+
+ _current_start = other._current_start;
+ _current_end = other._current_end;
for (RegionSelection::const_iterator i = other.begin(); i != other.end(); ++i) {
add (*i);
}
for (RegionSelection::const_iterator i = other.begin(); i != other.end(); ++i) {
add (*i);
}
- _current_start = other._current_start;
- _current_end = other._current_end;
}
}
-/**
- * operator= to set a RegionSelection to be the same as another.
+/** operator= to set a RegionSelection to be the same as another.
* @param other Other RegionSelection.
*/
* @param other Other RegionSelection.
*/
-
RegionSelection&
RegionSelection::operator= (const RegionSelection& other)
{
if (this != &other) {
clear_all();
RegionSelection&
RegionSelection::operator= (const RegionSelection& other)
{
if (this != &other) {
clear_all();
-
- for (RegionSelection::const_iterator i = other.begin(); i != other.end(); ++i) {
- add (*i);
- }
_current_start = other._current_start;
_current_end = other._current_end;
_current_start = other._current_start;
_current_end = other._current_end;
+
+ for (RegionSelection::const_iterator i = other.begin(); i != other.end(); ++i) {
+ add (*i);
+ }
}
return *this;
}
}
return *this;
}
-/**
- * Empty this RegionSelection.
+/** Empty this RegionSelection.
*/
*/
-
void
RegionSelection::clear_all()
{
void
RegionSelection::clear_all()
{
@@
-96,18
+91,15
@@
RegionSelection::clear_all()
* @param rv RegionView.
* @return true if this selection contains rv.
*/
* @param rv RegionView.
* @return true if this selection contains rv.
*/
-
bool RegionSelection::contains (RegionView* rv) const
{
return find (begin(), end(), rv) != end();
}
bool RegionSelection::contains (RegionView* rv) const
{
return find (begin(), end(), rv) != end();
}
-/**
- * Add a region to the selection.
+/** Add a region to the selection.
* @param rv Region to add.
* @return false if we already had the region, otherwise true.
*/
* @param rv Region to add.
* @return false if we already had the region, otherwise true.
*/
-
bool
RegionSelection::add (RegionView* rv)
{
bool
RegionSelection::add (RegionView* rv)
{
@@
-119,11
+111,11
@@
RegionSelection::add (RegionView* rv)
if (rv->region()->first_frame() < _current_start || empty()) {
_current_start = rv->region()->first_frame();
}
if (rv->region()->first_frame() < _current_start || empty()) {
_current_start = rv->region()->first_frame();
}
-
+
if (rv->region()->last_frame() > _current_end || empty()) {
_current_end = rv->region()->last_frame();
}
if (rv->region()->last_frame() > _current_end || empty()) {
_current_end = rv->region()->last_frame();
}
-
+
push_back (rv);
/* add to layer sorted list */
push_back (rv);
/* add to layer sorted list */
@@
-133,23
+125,19
@@
RegionSelection::add (RegionView* rv)
return true;
}
return true;
}
-/**
- * Remove a region from the selection.
+/** Remove a region from the selection.
* @param rv Region to remove.
*/
* @param rv Region to remove.
*/
-
void
RegionSelection::remove_it (RegionView *rv)
{
remove (rv);
}
void
RegionSelection::remove_it (RegionView *rv)
{
remove (rv);
}
-/**
- * Remove a region from the selection.
+/** Remove a region from the selection.
* @param rv Region to remove.
* @return true if the region was in the selection, false if not.
*/
* @param rv Region to remove.
* @return true if the region was in the selection, false if not.
*/
-
bool
RegionSelection::remove (RegionView* rv)
{
bool
RegionSelection::remove (RegionView* rv)
{
@@
-159,7
+147,7
@@
RegionSelection::remove (RegionView* rv)
// remove from layer sorted list
_bylayer.remove (rv);
// remove from layer sorted list
_bylayer.remove (rv);
-
+
if (size() == 1) {
/* this is the last one, so when we delete it
if (size() == 1) {
/* this is the last one, so when we delete it
@@
-170,37
+158,37
@@
RegionSelection::remove (RegionView* rv)
_current_end = 0;
} else {
_current_end = 0;
} else {
-
+
boost::shared_ptr<Region> region ((*r)->region());
boost::shared_ptr<Region> region ((*r)->region());
-
+
if (region->first_frame() == _current_start) {
if (region->first_frame() == _current_start) {
-
+
/* reset current start */
/* reset current start */
-
+
nframes_t ref = max_frames;
nframes_t ref = max_frames;
-
+
for (RegionSelection::iterator i = begin (); i != end(); ++i) {
if (region->first_frame() < ref) {
ref = region->first_frame();
}
}
for (RegionSelection::iterator i = begin (); i != end(); ++i) {
if (region->first_frame() < ref) {
ref = region->first_frame();
}
}
-
+
_current_start = ref;
_current_start = ref;
-
+
}
}
-
+
if (region->last_frame() == _current_end) {
/* reset current end */
if (region->last_frame() == _current_end) {
/* reset current end */
-
+
nframes_t ref = 0;
nframes_t ref = 0;
-
+
for (RegionSelection::iterator i = begin (); i != end(); ++i) {
if (region->first_frame() > ref) {
ref = region->first_frame();
}
}
for (RegionSelection::iterator i = begin (); i != end(); ++i) {
if (region->first_frame() > ref) {
ref = region->first_frame();
}
}
-
+
_current_end = ref;
}
}
_current_end = ref;
}
}
@@
-213,11
+201,9
@@
RegionSelection::remove (RegionView* rv)
return false;
}
return false;
}
-/**
- * Add a region to the list sorted by layer.
+/** Add a region to the list sorted by layer.
* @param rv Region to add.
*/
* @param rv Region to add.
*/
-
void
RegionSelection::add_to_layer (RegionView * rv)
{
void
RegionSelection::add_to_layer (RegionView * rv)
{
@@
-248,7
+234,6
@@
struct RegionSortByTime {
* @param foo List which will be filled with the selection's regions
* sorted by position.
*/
* @param foo List which will be filled with the selection's regions
* sorted by position.
*/
-
void
RegionSelection::by_position (list<RegionView*>& foo) const
{
void
RegionSelection::by_position (list<RegionView*>& foo) const
{
@@
-265,7
+250,7
@@
RegionSelection::by_position (list<RegionView*>& foo) const
struct RegionSortByTrack {
bool operator() (const RegionView* a, const RegionView* b) const {
struct RegionSortByTrack {
bool operator() (const RegionView* a, const RegionView* b) const {
-
+
/* really, track and position */
if (a->get_trackview().order() == b->get_trackview().order()) {
/* really, track and position */
if (a->get_trackview().order() == b->get_trackview().order()) {
@@
-281,7
+266,6
@@
struct RegionSortByTrack {
* @param List which will be filled with the selection's regions
* sorted by track and position.
*/
* @param List which will be filled with the selection's regions
* sorted by track and position.
*/
-
void
RegionSelection::by_track (list<RegionView*>& foo) const
{
void
RegionSelection::by_track (list<RegionView*>& foo) const
{
@@
-299,7
+283,6
@@
RegionSelection::by_track (list<RegionView*>& foo) const
/**
* @param Sort the selection by position and track.
*/
/**
* @param Sort the selection by position and track.
*/
-
void
RegionSelection::sort_by_position_and_track ()
{
void
RegionSelection::sort_by_position_and_track ()
{
@@
-311,7
+294,6
@@
RegionSelection::sort_by_position_and_track ()
* @param tv Track.
* @return true if any of the selection's regions are on tv.
*/
* @param tv Track.
* @return true if any of the selection's regions are on tv.
*/
-
bool
RegionSelection::involves (const TimeAxisView& tv) const
{
bool
RegionSelection::involves (const TimeAxisView& tv) const
{
@@
-322,4
+304,4
@@
RegionSelection::involves (const TimeAxisView& tv) const
}
return false;
}
}
return false;
}
-
+