mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-31 19:07:43 +01:00
fix deadlock in playlist::partition(); new first idle model, including message about loading visual data; make h-faders use scroll up/down and be scalable-clickable; new track menu stuff (waveform scaling/shape); fix up ordering of ruler menus; fix initial sensitivity of region menu operations
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3097 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
280ade047c
commit
cdf37e613b
25 changed files with 354 additions and 192 deletions
|
|
@ -26,7 +26,7 @@
|
|||
#include <boost/weak_ptr.hpp>
|
||||
|
||||
#include <ardour/location.h>
|
||||
#include "enums.h"
|
||||
#include "editing.h"
|
||||
#include "simplerect.h"
|
||||
#include "streamview.h"
|
||||
|
||||
|
|
@ -57,10 +57,10 @@ class AudioStreamView : public StreamView
|
|||
AudioStreamView (AudioTimeAxisView&);
|
||||
~AudioStreamView ();
|
||||
|
||||
void set_waveform_shape (WaveformShape);
|
||||
WaveformShape get_waveform_shape () const { return _waveform_shape; }
|
||||
void set_waveform_scale (WaveformScale);
|
||||
WaveformScale get_waveform_scale () const { return _waveform_scale; }
|
||||
void set_waveform_shape (Editing::WaveformShape);
|
||||
Editing::WaveformShape get_waveform_shape () const { return _waveform_shape; }
|
||||
void set_waveform_scale (Editing::WaveformScale);
|
||||
Editing::WaveformScale get_waveform_scale () const { return _waveform_scale; }
|
||||
|
||||
int set_height (gdouble h);
|
||||
int set_samples_per_unit (gdouble spp);
|
||||
|
|
@ -109,8 +109,8 @@ class AudioStreamView : public StreamView
|
|||
nframes_t last_rec_peak_frame;
|
||||
map<boost::shared_ptr<ARDOUR::Source>, bool> rec_peak_ready_map;
|
||||
|
||||
WaveformShape _waveform_shape;
|
||||
WaveformScale _waveform_scale;
|
||||
Editing::WaveformShape _waveform_shape;
|
||||
Editing::WaveformScale _waveform_scale;
|
||||
};
|
||||
|
||||
#endif /* __ardour_audio_streamview_h__ */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue