summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorDoug McLain <doug@nostar.net>2008-05-23 07:04:02 +0000
committerDoug McLain <doug@nostar.net>2008-05-23 07:04:02 +0000
commitb7f48adb562e7e5a6ba88882f7d97110790aa8b1 (patch)
tree0a8f95f1a0b64b02ed77e7885cffe30a3ff5cfe6 /gtk2_ardour
parent07f2210880c4725f4c2ba5ebddbeadbd60a4e491 (diff)
remove autostools files that should be there, and remove WIP stuff that shouldnt be there either
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3405 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/audio_region_view.cc1
-rw-r--r--gtk2_ardour/audio_streamview.cc33
-rw-r--r--gtk2_ardour/region_view.cc6
-rw-r--r--gtk2_ardour/time_axis_view_item.cc8
-rw-r--r--gtk2_ardour/time_axis_view_item.h3
5 files changed, 1 insertions, 50 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index 8ce3ab4fd5..b2f930ea20 100644
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -1239,7 +1239,6 @@ AudioRegionView::set_frame_color ()
if (_recregion) {
UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_RecordingRect.get(), &r, &g, &b, &a);
frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, a);
- cerr << "AudioRegionView::set_frame_color () Was a recregion" << endl;
for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) {
if (_region->muted()) {
diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 9666f7a33f..41d402f8f6 100644
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -57,7 +57,6 @@ AudioStreamView::AudioStreamView (AudioTimeAxisView& tv)
: StreamView (tv)
{
crossfades_visible = true;
- outline_region = false;
_waveform_scale = LinearWaveform;
_waveform_shape = Traditional;
@@ -470,7 +469,7 @@ AudioStreamView::set_waveform_scale (WaveformScale scale)
void
AudioStreamView::setup_rec_box ()
{
- cerr << _trackview.name() << " streamview SRB region_views.size() = " << region_views.size() << endl;
+ //cerr << _trackview.name() << " streamview SRB region_views.size() = " << region_views.size() << endl;
if (_trackview.session().transport_rolling()) {
@@ -479,7 +478,6 @@ AudioStreamView::setup_rec_box ()
if (!rec_active &&
_trackview.session().record_status() == Session::Recording &&
_trackview.get_diskstream()->record_enabled()) {
- cerr << "rec_active = 0" << endl;
if (_trackview.audio_track()->mode() == Normal && use_rec_regions && rec_regions.size() == rec_rects.size()) {
/* add a new region, but don't bother if they set use_rec_regions mid-record */
@@ -566,11 +564,9 @@ AudioStreamView::setup_rec_box ()
} else if (rec_active &&
(_trackview.session().record_status() != Session::Recording ||
!_trackview.get_diskstream()->record_enabled())) {
- cerr << "rec_active = 1" << endl;
screen_update_connection.disconnect();
rec_active = false;
rec_updating = false;
- outline_region = true;
}
} else {
@@ -657,7 +653,6 @@ void
AudioStreamView::update_rec_regions ()
{
if (use_rec_regions) {
- cerr << "AudioStreamView::update_rec_regions () outline_region = " << outline_region << endl;
uint32_t n = 0;
for (list<boost::shared_ptr<Region> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) {
@@ -688,15 +683,6 @@ AudioStreamView::update_rec_regions ()
if (nlen != region->length()) {
- if (outline_region) {
- for (list<RegionView *>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
- if ((*i)->region() == region) {
- (*i)->outline_entire_box();
- outline_region = false;
- }
- }
- }
-
region->freeze ();
region->set_position (_trackview.get_diskstream()->get_capture_start_frame(n), this);
region->set_length (nlen, this);
@@ -705,14 +691,6 @@ AudioStreamView::update_rec_regions ()
if (origlen == 1) {
/* our special initial length */
add_region_view_internal (region, false, true);
- if (outline_region) {
- outline_region = false;
- for (list<RegionView *>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
- if ((*i)->region() == region) {
- (*i)->outline_entire_box();
- }
- }
- }
}
/* also update rect */
@@ -730,15 +708,6 @@ AudioStreamView::update_rec_regions ()
if (region->source(0)->length() >= region->start() + nlen) {
- if (outline_region) {
- for (list<RegionView *>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
- if ((*i)->region() == region) {
- (*i)->outline_entire_box();
- outline_region = false;
- }
- }
- }
-
region->freeze ();
region->set_position (_trackview.get_diskstream()->get_capture_start_frame(n), this);
region->set_length (nlen, this);
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index 11105a8d9d..a88f821693 100644
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -204,7 +204,6 @@ void
RegionView::region_changed (Change what_changed)
{
ENSURE_GUI_THREAD (bind (mem_fun(*this, &RegionView::region_changed), what_changed));
- cerr << "RegionView::region_changed () outline_everything = " << outline_everything << endl;
if (what_changed & BoundsChanged) {
region_resized (what_changed);
@@ -228,11 +227,6 @@ RegionView::region_changed (Change what_changed)
if (what_changed & Region::LockChanged) {
region_locked ();
}
- if ((what_changed & LengthChanged) && outline_everything) {
- frame->property_outline_what() = 0x1 | 0x2 | 0x4 | 0x8;// == 0x15 == all four sides
- outline_everything = false;
- cerr << "RegionView::region_changed () what_changed = " << what_changed << endl;
- }
}
void
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index d119738657..df48fe9c24 100644
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -1049,11 +1049,3 @@ TimeAxisViewItem::idle_remove_this_item(TimeAxisViewItem* item, void* src)
return false;
}
-void
-TimeAxisViewItem::outline_entire_box ()
-{
- cerr << "TimeAxisViewItem::outline_entire_box () called: " << this << endl;
- outline_everything = true;
- //frame->property_outline_what() = 0x1 | 0x2 | 0x3 | 0x4;
-}
-
diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h
index 1fd491d5d0..618fd2125b 100644
--- a/gtk2_ardour/time_axis_view_item.h
+++ b/gtk2_ardour/time_axis_view_item.h
@@ -297,8 +297,6 @@ class TimeAxisViewItem : public Selectable
* event
*/
- void outline_entire_box ();
-
sigc::signal<void,std::string,void*> ItemRemoved ;
/** Emitted when the name/Id of this item is changed */
@@ -468,7 +466,6 @@ class TimeAxisViewItem : public Selectable
Visibility visibility;
bool _recregion;
- bool outline_everything;
}; /* class TimeAxisViewItem */