projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clear out any command line session name on closing a session so that the same session...
[ardour.git]
/
gtk2_ardour
/
tape_region_view.cc
diff --git
a/gtk2_ardour/tape_region_view.cc
b/gtk2_ardour/tape_region_view.cc
index f46d1c05dc9e8e6ac9c09c4d9692519a2eba5fd9..c5267a9f243173bcf79816847ee87ed9b4cae8b6 100644
(file)
--- a/
gtk2_ardour/tape_region_view.cc
+++ b/
gtk2_ardour/tape_region_view.cc
@@
-24,10
+24,10
@@
#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/gtk_ui.h>
-#include
<ardour/playlist.h>
-#include
<ardour/audioregion.h>
-#include
<ardour/audiosource.h>
-#include
<ardour/audio_diskstream.h>
+#include
"ardour/playlist.h"
+#include
"ardour/audioregion.h"
+#include
"ardour/audiosource.h"
+#include
"ardour/audio_diskstream.h"
#include "tape_region_view.h"
#include "audio_time_axis.h"
#include "tape_region_view.h"
#include "audio_time_axis.h"
@@
-44,6
+44,7
@@
using namespace ArdourCanvas;
const TimeAxisViewItem::Visibility TapeAudioRegionView::default_tape_visibility
= TimeAxisViewItem::Visibility (
TimeAxisViewItem::ShowNameHighlight |
const TimeAxisViewItem::Visibility TapeAudioRegionView::default_tape_visibility
= TimeAxisViewItem::Visibility (
TimeAxisViewItem::ShowNameHighlight |
+ TimeAxisViewItem::ShowNameText |
TimeAxisViewItem::ShowFrame |
TimeAxisViewItem::HideFrameRight |
TimeAxisViewItem::FullWidthNameHighlight);
TimeAxisViewItem::ShowFrame |
TimeAxisViewItem::HideFrameRight |
TimeAxisViewItem::FullWidthNameHighlight);
@@
-51,18
+52,22
@@
const TimeAxisViewItem::Visibility TapeAudioRegionView::default_tape_visibility
TapeAudioRegionView::TapeAudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv,
boost::shared_ptr<AudioRegion> r,
double spu,
TapeAudioRegionView::TapeAudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv,
boost::shared_ptr<AudioRegion> r,
double spu,
- Gdk::Color& basic_color)
+ Gdk::Color
const
& basic_color)
- : AudioRegionView (parent, tv, r, spu, basic_color,
+ : AudioRegionView (parent, tv, r, spu, basic_color,
false,
TimeAxisViewItem::Visibility ((r->position() != 0) ? default_tape_visibility :
TimeAxisViewItem::Visibility (default_tape_visibility|TimeAxisViewItem::HideFrameLeft)))
{
}
void
TimeAxisViewItem::Visibility ((r->position() != 0) ? default_tape_visibility :
TimeAxisViewItem::Visibility (default_tape_visibility|TimeAxisViewItem::HideFrameLeft)))
{
}
void
-TapeAudioRegionView::init (Gdk::Color
& basic_color, bool wfw
)
+TapeAudioRegionView::init (Gdk::Color
const & basic_color, bool /*wfw*/
)
{
{
- AudioRegionView::init(basic_color, wfw);
+ /* never wait for data: always just create the waves, connect once and then
+ we'll update whenever we need to.
+ */
+
+ AudioRegionView::init(basic_color, false);
/* every time the wave data changes and peaks are ready, redraw */
/* every time the wave data changes and peaks are ready, redraw */
@@
-96,5
+101,5
@@
void
TapeAudioRegionView::set_frame_color ()
{
fill_opacity = 255;
TapeAudioRegionView::set_frame_color ()
{
fill_opacity = 255;
-
TimeAxisViewItem
::set_frame_color ();
+
AudioRegionView
::set_frame_color ();
}
}