13
0

No-op: whitespace only.

git-svn-id: svn://localhost/ardour2/branches/3.0@8046 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-11-16 14:41:17 +00:00
parent ee76685f8d
commit eb9530b2bb

View File

@ -121,73 +121,73 @@ class AudioRegionView : public RegionView
protected: protected:
/* this constructor allows derived types /* this constructor allows derived types
to specify their visibility requirements to specify their visibility requirements
to the TimeAxisViewItem parent class to the TimeAxisViewItem parent class
*/ */
enum Flags { enum Flags {
EnvelopeVisible = 0x1, EnvelopeVisible = 0x1,
WaveformVisible = 0x4, WaveformVisible = 0x4,
WaveformRectified = 0x8, WaveformRectified = 0x8,
WaveformLogScaled = 0x10, WaveformLogScaled = 0x10,
}; };
std::vector<ArdourCanvas::WaveView *> waves; std::vector<ArdourCanvas::WaveView *> waves;
std::vector<ArdourCanvas::WaveView *> tmp_waves; ///< see ::create_waves() std::vector<ArdourCanvas::WaveView *> tmp_waves; ///< see ::create_waves()
std::list<std::pair<framepos_t, ArdourCanvas::SimpleLine*> > feature_lines;
std::list<std::pair<framepos_t, ArdourCanvas::SimpleLine*> > feature_lines; ArdourCanvas::Polygon* sync_mark; ///< polgyon for sync position
ArdourCanvas::SimpleLine* zero_line;
ArdourCanvas::Polygon* sync_mark; ///< polgyon for sync position ArdourCanvas::Polygon* fade_in_shape;
ArdourCanvas::SimpleLine* zero_line; ArdourCanvas::Polygon* fade_out_shape;
ArdourCanvas::Polygon* fade_in_shape; ArdourCanvas::SimpleRect* fade_in_handle; ///< fade in handle, or 0
ArdourCanvas::Polygon* fade_out_shape; ArdourCanvas::SimpleRect* fade_out_handle; ///< fade out handle, or 0
ArdourCanvas::SimpleRect* fade_in_handle; ///< fade in handle, or 0 ArdourCanvas::SimpleLine* fade_position_line;
ArdourCanvas::SimpleRect* fade_out_handle; ///< fade out handle, or 0
ArdourCanvas::SimpleLine* fade_position_line; AudioRegionGainLine * gain_line;
AudioRegionGainLine * gain_line; double _amplitude_above_axis;
double _amplitude_above_axis; uint32_t _flags;
uint32_t fade_color;
uint32_t _flags;
uint32_t fade_color; void reset_fade_shapes ();
void reset_fade_in_shape ();
void reset_fade_shapes (); void reset_fade_out_shape ();
void reset_fade_in_shape (); void fade_in_changed ();
void reset_fade_out_shape (); void fade_out_changed ();
void fade_in_changed (); void fade_in_active_changed ();
void fade_out_changed (); void fade_out_active_changed ();
void fade_in_active_changed ();
void fade_out_active_changed (); void region_resized (const PBD::PropertyChange&);
void region_muted ();
void region_resized (const PBD::PropertyChange&); void region_scale_amplitude_changed ();
void region_muted (); void region_renamed ();
void region_scale_amplitude_changed ();
void region_renamed (); void create_one_wave (uint32_t, bool);
void manage_zero_line ();
void create_one_wave (uint32_t, bool); void peaks_ready_handler (uint32_t);
void manage_zero_line (); void set_flags (XMLNode *);
void peaks_ready_handler (uint32_t); void store_flags ();
void set_flags (XMLNode *);
void store_flags (); void set_colors ();
void compute_colors (Gdk::Color const &);
void set_colors (); void reset_width_dependent_items (double pixel_width);
void compute_colors (Gdk::Color const &); void set_waveview_data_src();
void reset_width_dependent_items (double pixel_width); void set_frame_color ();
void set_waveview_data_src();
void set_frame_color (); void color_handler ();
void color_handler (); std::vector<GnomeCanvasWaveViewCache*> wave_caches;
std::vector<GnomeCanvasWaveViewCache*> wave_caches; void transients_changed();
void transients_changed(); private:
private: void setup_fade_handle_positions ();
void setup_fade_handle_positions ();
/** A ScopedConnection for each PeaksReady callback (one per channel). Each member /** A ScopedConnection for each PeaksReady callback (one per channel). Each member
* may be 0 if no connection exists. * may be 0 if no connection exists.
*/ */