diff options
author | Robin Gareus <robin@gareus.org> | 2019-04-13 19:19:29 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2019-04-13 19:19:29 +0200 |
commit | 2f91bdfa5390bdf992ab7044488b5afb21716661 (patch) | |
tree | 3418e802cdbb431cc10c65eb5dfcbbc6925d5984 /libs/ardour/ardour | |
parent | 31815b5f268fa0233cd25b7ff2c8a246c12c20d1 (diff) |
NO-OP: <tab> after <space> fixes in libs
Diffstat (limited to 'libs/ardour/ardour')
23 files changed, 88 insertions, 96 deletions
diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index f699e01988..4f8d7a94ba 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -264,21 +264,21 @@ class LIBARDOUR_API AudioEngine : public PortManager, public SessionHandlePtr static AudioEngine* _instance; - Glib::Threads::Mutex _process_lock; + Glib::Threads::Mutex _process_lock; Glib::Threads::RecMutex _state_lock; Glib::Threads::Cond session_removed; bool session_remove_pending; - sampleoffset_t session_removal_countdown; + sampleoffset_t session_removal_countdown; gain_t session_removal_gain; gain_t session_removal_gain_step; bool _running; bool _freewheeling; /// number of samples between each check for changes in monitor input - samplecnt_t monitor_check_interval; + samplecnt_t monitor_check_interval; /// time of the last monitor check in samples - samplecnt_t last_monitor_check; + samplecnt_t last_monitor_check; /// the number of samples processed since start() was called - samplecnt_t _processed_samples; + samplecnt_t _processed_samples; Glib::Threads::Thread* m_meter_thread; ProcessThread* _main_thread; MTDM* _mtdm; @@ -286,28 +286,28 @@ class LIBARDOUR_API AudioEngine : public PortManager, public SessionHandlePtr LatencyMeasurement _measuring_latency; PortEngine::PortHandle _latency_input_port; PortEngine::PortHandle _latency_output_port; - samplecnt_t _latency_flush_samples; + samplecnt_t _latency_flush_samples; std::string _latency_input_name; std::string _latency_output_name; - samplecnt_t _latency_signal_latency; + samplecnt_t _latency_signal_latency; bool _stopped_for_latency; bool _started_for_latency; bool _in_destructor; std::string _last_backend_error_string; - Glib::Threads::Thread* _hw_reset_event_thread; - gint _hw_reset_request_count; - Glib::Threads::Cond _hw_reset_condition; - Glib::Threads::Mutex _reset_request_lock; - gint _stop_hw_reset_processing; - Glib::Threads::Thread* _hw_devicelist_update_thread; - gint _hw_devicelist_update_count; - Glib::Threads::Cond _hw_devicelist_update_condition; - Glib::Threads::Mutex _devicelist_update_lock; - gint _stop_hw_devicelist_processing; - uint32_t _start_cnt; - uint32_t _init_countdown; + Glib::Threads::Thread* _hw_reset_event_thread; + gint _hw_reset_request_count; + Glib::Threads::Cond _hw_reset_condition; + Glib::Threads::Mutex _reset_request_lock; + gint _stop_hw_reset_processing; + Glib::Threads::Thread* _hw_devicelist_update_thread; + gint _hw_devicelist_update_count; + Glib::Threads::Cond _hw_devicelist_update_condition; + Glib::Threads::Mutex _devicelist_update_lock; + gint _stop_hw_devicelist_processing; + uint32_t _start_cnt; + uint32_t _init_countdown; void start_hw_event_processing(); void stop_hw_event_processing(); diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h index e66ee0e780..9d79fe3438 100644 --- a/libs/ardour/ardour/audioplaylist.h +++ b/libs/ardour/ardour/audioplaylist.h @@ -61,6 +61,4 @@ private: } /* namespace ARDOUR */ -#endif /* __ardour_audio_playlist_h__ */ - - +#endif /* __ardour_audio_playlist_h__ */ diff --git a/libs/ardour/ardour/cycles.h b/libs/ardour/ardour/cycles.h index eed3bb452d..3b7d072946 100644 --- a/libs/ardour/ardour/cycles.h +++ b/libs/ardour/ardour/cycles.h @@ -45,7 +45,7 @@ extern cycles_t cacheflush_time; #if defined(__x86_64__) -#define rdtscll(lo, hi) \ +#define rdtscll(lo, hi) \ __asm__ __volatile__("rdtsc" : "=a" (lo), "=d" (hi)) static inline cycles_t get_cycles (void) @@ -58,7 +58,7 @@ static inline cycles_t get_cycles (void) #else -#define rdtscll(val) \ +#define rdtscll(val) \ __asm__ __volatile__("rdtsc" : "=A" (val)) static inline cycles_t get_cycles (void) @@ -80,7 +80,7 @@ static inline cycles_t get_cycles(void) #elif defined(__powerpc__) -#define CPU_FTR_601 0x00000100 +#define CPU_FTR_601 0x00000100 typedef uint32_t cycles_t; @@ -96,13 +96,13 @@ static inline cycles_t get_cycles(void) cycles_t ret = 0; __asm__ __volatile__( - "98: mftb %0\n" + "98: mftb %0\n" "99:\n" ".section __ftr_fixup,\"a\"\n" - " .long %1\n" - " .long 0\n" - " .long 98b\n" - " .long 99b\n" + " .long %1\n" + " .long 0\n" + " .long 98b\n" + " .long 99b\n" ".previous" : "=r" (ret) : "i" (CPU_FTR_601)); return ret; diff --git a/libs/ardour/ardour/export_channel.h b/libs/ardour/ardour/export_channel.h index 8f4d8fc27c..0a7aedcb86 100644 --- a/libs/ardour/ardour/export_channel.h +++ b/libs/ardour/ardour/export_channel.h @@ -183,13 +183,13 @@ class LIBARDOUR_API RouteExportChannel : public ExportChannel // Removes the processor from the track when deleted class ProcessorRemover { - public: - ProcessorRemover (boost::shared_ptr<Route> route, boost::shared_ptr<CapturingProcessor> processor) - : route (route), processor (processor) {} - ~ProcessorRemover(); - private: - boost::shared_ptr<Route> route; - boost::shared_ptr<CapturingProcessor> processor; + public: + ProcessorRemover (boost::shared_ptr<Route> route, boost::shared_ptr<CapturingProcessor> processor) + : route (route), processor (processor) {} + ~ProcessorRemover(); + private: + boost::shared_ptr<Route> route; + boost::shared_ptr<CapturingProcessor> processor; }; boost::shared_ptr<CapturingProcessor> processor; diff --git a/libs/ardour/ardour/iec1ppmdsp.h b/libs/ardour/ardour/iec1ppmdsp.h index b6f1501db7..ede9955a88 100644 --- a/libs/ardour/ardour/iec1ppmdsp.h +++ b/libs/ardour/ardour/iec1ppmdsp.h @@ -18,7 +18,7 @@ */ #ifndef __IEC1PPMDSP_H -#define __IEC1PPMDSP_H +#define __IEC1PPMDSP_H #include "ardour/libardour_visibility.h" diff --git a/libs/ardour/ardour/iec2ppmdsp.h b/libs/ardour/ardour/iec2ppmdsp.h index 6a3852da1d..634f670365 100644 --- a/libs/ardour/ardour/iec2ppmdsp.h +++ b/libs/ardour/ardour/iec2ppmdsp.h @@ -18,7 +18,7 @@ */ #ifndef __IEC2PPMDSP_H -#define __IEC2PPMDSP_H +#define __IEC2PPMDSP_H #include "ardour/libardour_visibility.h" diff --git a/libs/ardour/ardour/io_processor.h b/libs/ardour/ardour/io_processor.h index c59addffb2..75e68a42aa 100644 --- a/libs/ardour/ardour/io_processor.h +++ b/libs/ardour/ardour/io_processor.h @@ -44,10 +44,12 @@ class LIBARDOUR_API IOProcessor : public Processor { public: IOProcessor (Session&, bool with_input, bool with_output, - const std::string& proc_name, const std::string io_name="", - ARDOUR::DataType default_type = DataType::AUDIO, bool sendish=false); - IOProcessor (Session&, boost::shared_ptr<IO> input, boost::shared_ptr<IO> output, - const std::string& proc_name, ARDOUR::DataType default_type = DataType::AUDIO); + const std::string& proc_name, const std::string io_name="", + ARDOUR::DataType default_type = DataType::AUDIO, bool sendish=false); + + IOProcessor (Session&, boost::shared_ptr<IO> input, boost::shared_ptr<IO> output, + const std::string& proc_name, ARDOUR::DataType default_type = DataType::AUDIO); + virtual ~IOProcessor (); bool set_name (const std::string& str); diff --git a/libs/ardour/ardour/kmeterdsp.h b/libs/ardour/ardour/kmeterdsp.h index 7fe2b9d11b..a48e60e504 100644 --- a/libs/ardour/ardour/kmeterdsp.h +++ b/libs/ardour/ardour/kmeterdsp.h @@ -18,7 +18,7 @@ */ #ifndef __KMETERDSP_H -#define __KMETERDSP_H +#define __KMETERDSP_H #include "ardour/libardour_visibility.h" diff --git a/libs/ardour/ardour/midi_playlist.h b/libs/ardour/ardour/midi_playlist.h index 2d4e494781..53d62bff4f 100644 --- a/libs/ardour/ardour/midi_playlist.h +++ b/libs/ardour/ardour/midi_playlist.h @@ -137,6 +137,4 @@ private: } /* namespace ARDOUR */ -#endif /* __ardour_midi_playlist_h__ */ - - +#endif /* __ardour_midi_playlist_h__ */ diff --git a/libs/ardour/ardour/mix.h b/libs/ardour/ardour/mix.h index 4676c01046..a3d9cbd8b4 100644 --- a/libs/ardour/ardour/mix.h +++ b/libs/ardour/ardour/mix.h @@ -72,6 +72,6 @@ LIBARDOUR_API void default_find_peaks (const ARDOUR::Sample * bu LIBARDOUR_API void default_apply_gain_to_buffer (ARDOUR::Sample * buf, ARDOUR::pframes_t nframes, float gain); LIBARDOUR_API void default_mix_buffers_with_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, ARDOUR::pframes_t nframes, float gain); LIBARDOUR_API void default_mix_buffers_no_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, ARDOUR::pframes_t nframes); -LIBARDOUR_API void default_copy_vector (ARDOUR::Sample * dst, const ARDOUR::Sample * src, ARDOUR::pframes_t nframes); +LIBARDOUR_API void default_copy_vector (ARDOUR::Sample * dst, const ARDOUR::Sample * src, ARDOUR::pframes_t nframes); #endif /* __ardour_mix_h__ */ diff --git a/libs/ardour/ardour/msvc_libardour.h b/libs/ardour/ardour/msvc_libardour.h index f8edcdd3cb..198af34dbe 100644 --- a/libs/ardour/ardour/msvc_libardour.h +++ b/libs/ardour/ardour/msvc_libardour.h @@ -35,13 +35,13 @@ namespace ARDOUR { #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif /* __cplusplus */ // LIBARDOUR_API char* LIBARDOUR_APICALLTYPE placeholder_for_non_msvc_specific_function(s); #ifdef __cplusplus -} /* extern "C" */ -#endif /* __cplusplus */ +} /* extern "C" */ +#endif /* __cplusplus */ } // namespace ARDOUR @@ -58,16 +58,16 @@ namespace ARDOUR { #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif /* __cplusplus */ LIBARDOUR_API int LIBARDOUR_APICALLTYPE symlink(const char *dest, const char *shortcut, const char *working_directory = 0); LIBARDOUR_API int LIBARDOUR_APICALLTYPE readlink(const char *__restrict shortcut, char *__restrict buf, size_t bufsize); #ifdef __cplusplus -} /* extern "C" */ -#endif /* __cplusplus */ +} /* extern "C" */ +#endif /* __cplusplus */ } // namespace ARDOUR -#endif // COMPILER_MSVC -#endif // __mavc_libardour_h__ +#endif // COMPILER_MSVC +#endif // __mavc_libardour_h__ diff --git a/libs/ardour/ardour/note_fixer.h b/libs/ardour/ardour/note_fixer.h index 4851636a65..1e028ad637 100644 --- a/libs/ardour/ardour/note_fixer.h +++ b/libs/ardour/ardour/note_fixer.h @@ -99,6 +99,4 @@ private: } /* namespace ARDOUR */ -#endif /* __ardour_note_fixer_h__ */ - - +#endif /* __ardour_note_fixer_h__ */ diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index ccc807c642..c629591420 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -426,6 +426,4 @@ private: } /* namespace ARDOUR */ -#endif /* __ardour_playlist_h__ */ - - +#endif /* __ardour_playlist_h__ */ diff --git a/libs/ardour/ardour/plugin_manager.h b/libs/ardour/ardour/plugin_manager.h index 264018345d..80b578c20f 100644 --- a/libs/ardour/ardour/plugin_manager.h +++ b/libs/ardour/ardour/plugin_manager.h @@ -172,8 +172,8 @@ private: ARDOUR::PluginInfoList _empty_plugin_info; ARDOUR::PluginInfoList* _windows_vst_plugin_info; - ARDOUR::PluginInfoList* _lxvst_plugin_info; - ARDOUR::PluginInfoList* _mac_vst_plugin_info; + ARDOUR::PluginInfoList* _lxvst_plugin_info; + ARDOUR::PluginInfoList* _mac_vst_plugin_info; ARDOUR::PluginInfoList* _ladspa_plugin_info; ARDOUR::PluginInfoList* _lv2_plugin_info; ARDOUR::PluginInfoList* _au_plugin_info; diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h index d053c6aee0..e2e2de1631 100644 --- a/libs/ardour/ardour/port.h +++ b/libs/ardour/ardour/port.h @@ -158,7 +158,7 @@ protected: PortEngine::PortHandle _port_handle; - static bool _connecting_blocked; + static bool _connecting_blocked; static pframes_t _cycle_nframes; /* access only from process() tree */ static pframes_t _global_port_buffer_offset; /* access only from process() tree */ diff --git a/libs/ardour/ardour/presentation_info.h b/libs/ardour/ardour/presentation_info.h index f5e1ed4531..08b253ac20 100644 --- a/libs/ardour/ardour/presentation_info.h +++ b/libs/ardour/ardour/presentation_info.h @@ -73,13 +73,12 @@ class LIBARDOUR_API PresentationInfo : public PBD::Stateful * There are several pathways for the order being set: * * - object created during session loading from XML - * - numeric order will be set during ::set_state(), based on - * - type will be set during ctor call + * - numeric order will be set during ::set_state(), based on + * - type will be set during ctor call * * - object created in response to user request - * - numeric order will be set by Session, before adding - * to container. - * - type set during ctor call + * - numeric order will be set by Session, before adding to container. + * - type set during ctor call * * * OBJECT IDENTITY diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index a8278874b0..6a2ddcb79f 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -586,7 +586,7 @@ public: bool has_external_redirects() const; /* can only be executed by a route for which is_monitor() is true - * (i.e. the monitor out) + * (i.e. the monitor out) */ void monitor_run (samplepos_t start_sample, samplepos_t end_sample, pframes_t nframes); diff --git a/libs/ardour/ardour/runtime_functions.h b/libs/ardour/ardour/runtime_functions.h index 45d6ec7015..ac4187a1e9 100644 --- a/libs/ardour/ardour/runtime_functions.h +++ b/libs/ardour/ardour/runtime_functions.h @@ -25,19 +25,19 @@ namespace ARDOUR { - typedef float (*compute_peak_t) (const ARDOUR::Sample *, pframes_t, float); - typedef void (*find_peaks_t) (const ARDOUR::Sample *, pframes_t, float *, float*); - typedef void (*apply_gain_to_buffer_t) (ARDOUR::Sample *, pframes_t, float); - typedef void (*mix_buffers_with_gain_t) (ARDOUR::Sample *, const ARDOUR::Sample *, pframes_t, float); - typedef void (*mix_buffers_no_gain_t) (ARDOUR::Sample *, const ARDOUR::Sample *, pframes_t); - typedef void (*copy_vector_t) (ARDOUR::Sample *, const ARDOUR::Sample *, pframes_t); - - LIBARDOUR_API extern compute_peak_t compute_peak; - LIBARDOUR_API extern find_peaks_t find_peaks; - LIBARDOUR_API extern apply_gain_to_buffer_t apply_gain_to_buffer; - LIBARDOUR_API extern mix_buffers_with_gain_t mix_buffers_with_gain; - LIBARDOUR_API extern mix_buffers_no_gain_t mix_buffers_no_gain; - LIBARDOUR_API extern copy_vector_t copy_vector; + typedef float (*compute_peak_t) (const ARDOUR::Sample *, pframes_t, float); + typedef void (*find_peaks_t) (const ARDOUR::Sample *, pframes_t, float *, float*); + typedef void (*apply_gain_to_buffer_t) (ARDOUR::Sample *, pframes_t, float); + typedef void (*mix_buffers_with_gain_t) (ARDOUR::Sample *, const ARDOUR::Sample *, pframes_t, float); + typedef void (*mix_buffers_no_gain_t) (ARDOUR::Sample *, const ARDOUR::Sample *, pframes_t); + typedef void (*copy_vector_t) (ARDOUR::Sample *, const ARDOUR::Sample *, pframes_t); + + LIBARDOUR_API extern compute_peak_t compute_peak; + LIBARDOUR_API extern find_peaks_t find_peaks; + LIBARDOUR_API extern apply_gain_to_buffer_t apply_gain_to_buffer; + LIBARDOUR_API extern mix_buffers_with_gain_t mix_buffers_with_gain; + LIBARDOUR_API extern mix_buffers_no_gain_t mix_buffers_no_gain; + LIBARDOUR_API extern copy_vector_t copy_vector; } #endif /* __ardour_runtime_functions_h__ */ diff --git a/libs/ardour/ardour/soundcloud_upload.h b/libs/ardour/ardour/soundcloud_upload.h index aff9245d66..bcf924738f 100644 --- a/libs/ardour/ardour/soundcloud_upload.h +++ b/libs/ardour/ardour/soundcloud_upload.h @@ -32,18 +32,18 @@ public: SoundcloudUploader(); ~SoundcloudUploader(); - std::string Get_Auth_Token(std::string username, std::string password); + std::string Get_Auth_Token(std::string username, std::string password); std::string Upload (std::string file_path, std::string title, std::string token, bool ispublic, bool downloadable, ARDOUR::ExportHandler *caller); - static int progress_callback(void *caller, double dltotal, double dlnow, double ultotal, double ulnow); + static int progress_callback(void *caller, double dltotal, double dlnow, double ultotal, double ulnow); private: - void setcUrlOptions(); + void setcUrlOptions(); CURL *curl_handle; CURLM *multi_handle; - char errorBuffer[CURL_ERROR_SIZE]; // storage for cUrl error message + char errorBuffer[CURL_ERROR_SIZE]; // storage for cUrl error message std::string title; ARDOUR::ExportHandler *caller; diff --git a/libs/ardour/ardour/soundseq.h b/libs/ardour/ardour/soundseq.h index 93faa75b9b..662e78c6a6 100644 --- a/libs/ardour/ardour/soundseq.h +++ b/libs/ardour/ardour/soundseq.h @@ -47,7 +47,7 @@ class LIBARDOUR_API SoundPlaylist : public EDL::Playlist { } /* namespace ARDOUR */ -#endif /* __soundseq_h__ */ +#endif /* __soundseq_h__ */ diff --git a/libs/ardour/ardour/transport_master.h b/libs/ardour/ardour/transport_master.h index f14da63d25..2b5ec06f1f 100644 --- a/libs/ardour/ardour/transport_master.h +++ b/libs/ardour/ardour/transport_master.h @@ -205,7 +205,7 @@ class LIBARDOUR_API TransportMaster : public PBD::Stateful { * ARDOURs transport position to the slaves requested transport position. * </li> * <li>TransportMaster::locked() should return true, otherwise Session::no_roll will be called</li> - * <li>TransportMaster::starting() should be false, otherwise the transport will not move until it becomes true</li> * + * <li>TransportMaster::starting() should be false, otherwise the transport will not move until it becomes true</li> * </ul> * * @param speed - The transport speed requested diff --git a/libs/ardour/ardour/vestige/vestige.h b/libs/ardour/ardour/vestige/vestige.h index 41e78f7a05..5abe1c62a7 100644 --- a/libs/ardour/ardour/vestige/vestige.h +++ b/libs/ardour/ardour/vestige/vestige.h @@ -30,10 +30,10 @@ #ifndef _VESTIGE_H #define _VESTIGE_H -#define CCONST(a, b, c, d)( ( ( (int) a ) << 24 ) | \ - ( ( (int) b ) << 16 ) | \ - ( ( (int) c ) << 8 ) | \ - ( ( (int) d ) << 0 ) ) +#define CCONST(a, b, c, d) (( ((int) a) << 24 ) | \ + ( ((int) b) << 16 ) | \ + ( ((int) c) << 8 ) | \ + ( ((int) d) << 0 )) #define audioMasterAutomate 0 #define audioMasterVersion 1 diff --git a/libs/ardour/ardour/vumeterdsp.h b/libs/ardour/ardour/vumeterdsp.h index 1271276d68..5cc4ad5e4a 100644 --- a/libs/ardour/ardour/vumeterdsp.h +++ b/libs/ardour/ardour/vumeterdsp.h @@ -18,7 +18,7 @@ */ #ifndef __VUMETERDSP_H -#define __VUMETERDSP_H +#define __VUMETERDSP_H #include "ardour/libardour_visibility.h" @@ -46,5 +46,4 @@ private: static float _g; // gain factor }; - #endif |