diff options
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/audio_unit.h | 5 | ||||
-rw-r--r-- | libs/ardour/ardour/audiosource.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/caimportable.h | 6 | ||||
-rw-r--r-- | libs/ardour/ardour/coreaudiosource.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/export_channel.h | 2 | ||||
-rwxr-xr-x | libs/ardour/ardour/lxvst_plugin.h | 8 | ||||
-rw-r--r-- | libs/ardour/ardour/plugin.h | 3 |
7 files changed, 15 insertions, 13 deletions
diff --git a/libs/ardour/ardour/audio_unit.h b/libs/ardour/ardour/audio_unit.h index f36e89073b..0a786d5462 100644 --- a/libs/ardour/ardour/audio_unit.h +++ b/libs/ardour/ardour/audio_unit.h @@ -97,7 +97,6 @@ class AUPlugin : public ARDOUR::Plugin int set_state(const XMLNode& node, int); - PresetRecord save_preset (std::string name); bool load_preset (PresetRecord); std::string current_preset() const; @@ -140,6 +139,10 @@ class AUPlugin : public ARDOUR::Plugin static std::string maybe_fix_broken_au_id (const std::string&); + protected: + std::string do_save_preset (std::string name); + void do_remove_preset (std::string); + private: void find_presets (); diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h index 67d5ddce3a..c9eb3bfc45 100644 --- a/libs/ardour/ardour/audiosource.h +++ b/libs/ardour/ardour/audiosource.h @@ -145,7 +145,7 @@ class AudioSource : virtual public Source, virtual framecnt_t read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) const = 0; virtual framecnt_t write_unlocked (Sample *dst, framecnt_t cnt) = 0; virtual std::string peak_path(std::string audio_path) = 0; - virtual std::string find_broken_peakfile (std::string missing_peak_path, + virtual std::string find_broken_peakfile (std::string /* missing_peak_path */, std::string audio_path) { return peak_path (audio_path); } virtual int read_peaks_with_fpp (PeakData *peaks, diff --git a/libs/ardour/ardour/caimportable.h b/libs/ardour/ardour/caimportable.h index 2e86ff2c90..1ed8676ee6 100644 --- a/libs/ardour/ardour/caimportable.h +++ b/libs/ardour/ardour/caimportable.h @@ -33,11 +33,11 @@ class CAImportableSource : public ImportableSource { CAImportableSource (const std::string& path); virtual ~CAImportableSource(); - nframes_t read (Sample* buffer, nframes_t nframes); + framecnt_t read (Sample* buffer, framecnt_t nframes); uint32_t channels() const; framecnt_t length() const; - nframes_t samplerate() const; - void seek (nframes_t pos); + framecnt_t samplerate() const; + void seek (framepos_t pos); framepos_t natural_position() const { return 0; } bool clamped_at_unity () const { return false; } diff --git a/libs/ardour/ardour/coreaudiosource.h b/libs/ardour/ardour/coreaudiosource.h index 2f283dfd36..820fa0b9d8 100644 --- a/libs/ardour/ardour/coreaudiosource.h +++ b/libs/ardour/ardour/coreaudiosource.h @@ -54,7 +54,7 @@ class CoreAudioSource : public AudioFileSource { uint16_t n_channels; void init_cafile (); - int safe_read (Sample*, nframes_t start, framecnt_t cnt, AudioBufferList&) const; + int safe_read (Sample*, framepos_t start, framecnt_t cnt, AudioBufferList&) const; }; }; /* namespace ARDOUR */ diff --git a/libs/ardour/ardour/export_channel.h b/libs/ardour/ardour/export_channel.h index 1a71f14c3c..a73d04aa36 100644 --- a/libs/ardour/ardour/export_channel.h +++ b/libs/ardour/ardour/export_channel.h @@ -47,7 +47,7 @@ class ExportChannel : public boost::less_than_comparable<ExportChannel> virtual ~ExportChannel () {} - virtual void set_max_buffer_size(framecnt_t frames) { } + virtual void set_max_buffer_size(framecnt_t) { } virtual void read (Sample const *& data, framecnt_t frames) const = 0; virtual bool empty () const = 0; diff --git a/libs/ardour/ardour/lxvst_plugin.h b/libs/ardour/ardour/lxvst_plugin.h index 24793772ef..108437b6a3 100755 --- a/libs/ardour/ardour/lxvst_plugin.h +++ b/libs/ardour/ardour/lxvst_plugin.h @@ -73,10 +73,10 @@ class LXVSTPlugin : public ARDOUR::Plugin std::string state_node_name() const { return "lxvst"; } void print_parameter (uint32_t, char*, uint32_t len) const; - bool parameter_is_audio(uint32_t i) const { return false; } - bool parameter_is_control(uint32_t i) const { return true; } - bool parameter_is_input(uint32_t i) const { return true; } - bool parameter_is_output(uint32_t i) const { return false; } + bool parameter_is_audio(uint32_t) const { return false; } + bool parameter_is_control(uint32_t) const { return true; } + bool parameter_is_input(uint32_t) const { return true; } + bool parameter_is_output(uint32_t) const { return false; } bool load_preset (PresetRecord); int first_user_preset_index () const; diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h index 2c819e96f2..fcd7d6d19b 100644 --- a/libs/ardour/ardour/plugin.h +++ b/libs/ardour/ardour/plugin.h @@ -136,8 +136,7 @@ class Plugin : public PBD::StatefulDestructible, public Latent typedef std::map<const std::string, const float> ScalePoints; - virtual boost::shared_ptr<ScalePoints> - get_scale_points(uint32_t port_index) const { + virtual boost::shared_ptr<ScalePoints> get_scale_points(uint32_t /*port_index*/) const { return boost::shared_ptr<ScalePoints>(); } |