projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move contrasting_text_color() into ArdourCanvas
[ardour.git]
/
gtk2_ardour
/
audio_streamview.h
diff --git
a/gtk2_ardour/audio_streamview.h
b/gtk2_ardour/audio_streamview.h
index 93c74c5bb2bc086ec6aede0d98ab7c709bb7439f..8e9b095537d47e6f4e0d8725c9ec7b321f8be24c 100644
(file)
--- a/
gtk2_ardour/audio_streamview.h
+++ b/
gtk2_ardour/audio_streamview.h
@@
-27,7
+27,6
@@
#include "ardour/location.h"
#include "editing.h"
#include "ardour/location.h"
#include "editing.h"
-#include "simplerect.h"
#include "streamview.h"
namespace Gdk {
#include "streamview.h"
namespace Gdk {
@@
-35,11
+34,10
@@
namespace Gdk {
}
namespace ARDOUR {
}
namespace ARDOUR {
- class Route;
- class Crossfade;
- class PeakData;
class AudioRegion;
class AudioRegion;
+ class Route;
class Source;
class Source;
+ struct PeakData;
}
class PublicEditor;
}
class PublicEditor;
@@
-47,66
+45,37
@@
class Selectable;
class AudioTimeAxisView;
class AudioRegionView;
class RegionSelection;
class AudioTimeAxisView;
class AudioRegionView;
class RegionSelection;
-class CrossfadeView;
class Selection;
class AudioStreamView : public StreamView
{
public:
AudioStreamView (AudioTimeAxisView&);
class Selection;
class AudioStreamView : public StreamView
{
public:
AudioStreamView (AudioTimeAxisView&);
- ~AudioStreamView ();
-
- int set_samples_per_unit (gdouble spp);
int set_amplitude_above_axis (gdouble app);
gdouble get_amplitude_above_axis () { return _amplitude_above_axis; }
int set_amplitude_above_axis (gdouble app);
gdouble get_amplitude_above_axis () { return _amplitude_above_axis; }
- void set_show_waveforms (bool yn);
-
- void foreach_crossfadeview (void (CrossfadeView::*pmf)(void));
-
void show_all_fades ();
void hide_all_fades ();
void show_all_fades ();
void hide_all_fades ();
- void show_all_xfades ();
- void hide_all_xfades ();
- void hide_xfades_involving (AudioRegionView&);
- void reveal_xfades_involving (AudioRegionView&);
+ std::pair<std::list<AudioRegionView*>, std::list<AudioRegionView*> > hide_xfades_with (boost::shared_ptr<ARDOUR::AudioRegion> ar);
RegionView* create_region_view (boost::shared_ptr<ARDOUR::Region>, bool, bool);
private:
void setup_rec_box ();
RegionView* create_region_view (boost::shared_ptr<ARDOUR::Region>, bool, bool);
private:
void setup_rec_box ();
- void rec_peak_range_ready (
nframes_t start, nframes
_t cnt, boost::weak_ptr<ARDOUR::Source> src);
- void update_rec_regions ();
+ void rec_peak_range_ready (
framepos_t start, ARDOUR::framecnt
_t cnt, boost::weak_ptr<ARDOUR::Source> src);
+ void update_rec_regions (
ARDOUR::framepos_t, ARDOUR::framecnt_t
);
RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves, bool recording = false);
RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves, bool recording = false);
- void remove_region_view (boost::weak_ptr<ARDOUR::Region> );
void remove_audio_region_view (boost::shared_ptr<ARDOUR::AudioRegion> );
void remove_audio_region_view (boost::shared_ptr<ARDOUR::AudioRegion> );
- void undisplay_track ();
void redisplay_track ();
void redisplay_track ();
- void playlist_layered (boost::weak_ptr<ARDOUR::Track>);
- void playlist_switched (boost::weak_ptr<ARDOUR::Track>);
-
- void add_crossfade (boost::weak_ptr<ARDOUR::Crossfade>);
- void remove_crossfade (boost::shared_ptr<ARDOUR::Region>);
void color_handler ();
void color_handler ();
- void update_contents_height ();
- void update_content_height (CrossfadeView *);
-
- void parameter_changed (std::string const &);
- void set_waveform_shape (ARDOUR::WaveformShape);
- void set_waveform_scale (ARDOUR::WaveformScale);
-
double _amplitude_above_axis;
double _amplitude_above_axis;
- typedef std::map<boost::shared_ptr<ARDOUR::Crossfade>, CrossfadeView*> CrossfadeViewList;
- CrossfadeViewList crossfade_views;
- bool crossfades_visible;
-
std::map<boost::shared_ptr<ARDOUR::Source>, bool> rec_data_ready_map;
bool outline_region;
std::map<boost::shared_ptr<ARDOUR::Source>, bool> rec_data_ready_map;
bool outline_region;