Skip to content

Commit

Permalink
NO-OP: <tab> after <space> fixes in libs
Browse files Browse the repository at this point in the history
  • Loading branch information
x42 committed Apr 13, 2019
1 parent 31815b5 commit 2f91bdf
Show file tree
Hide file tree
Showing 63 changed files with 1,039 additions and 1,046 deletions.
38 changes: 19 additions & 19 deletions libs/ardour/ardour/audioengine.h
Original file line number Diff line number Diff line change
Expand Up @@ -264,50 +264,50 @@ 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;
MIDIDM* _mididm;
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();
Expand Down
4 changes: 1 addition & 3 deletions libs/ardour/ardour/audioplaylist.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,4 @@ class LIBARDOUR_API AudioPlaylist : public ARDOUR::Playlist

} /* namespace ARDOUR */

#endif /* __ardour_audio_playlist_h__ */


#endif /* __ardour_audio_playlist_h__ */
16 changes: 8 additions & 8 deletions libs/ardour/ardour/cycles.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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;

Expand All @@ -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;
Expand Down
14 changes: 7 additions & 7 deletions libs/ardour/ardour/export_channel.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion libs/ardour/ardour/iec1ppmdsp.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

#ifndef __IEC1PPMDSP_H
#define __IEC1PPMDSP_H
#define __IEC1PPMDSP_H

#include "ardour/libardour_visibility.h"

Expand Down
2 changes: 1 addition & 1 deletion libs/ardour/ardour/iec2ppmdsp.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

#ifndef __IEC2PPMDSP_H
#define __IEC2PPMDSP_H
#define __IEC2PPMDSP_H

#include "ardour/libardour_visibility.h"

Expand Down
10 changes: 6 additions & 4 deletions libs/ardour/ardour/io_processor.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion libs/ardour/ardour/kmeterdsp.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

#ifndef __KMETERDSP_H
#define __KMETERDSP_H
#define __KMETERDSP_H

#include "ardour/libardour_visibility.h"

Expand Down
4 changes: 1 addition & 3 deletions libs/ardour/ardour/midi_playlist.h
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,4 @@ class LIBARDOUR_API MidiPlaylist : public ARDOUR::Playlist

} /* namespace ARDOUR */

#endif /* __ardour_midi_playlist_h__ */


#endif /* __ardour_midi_playlist_h__ */
2 changes: 1 addition & 1 deletion libs/ardour/ardour/mix.h
Original file line number Diff line number Diff line change
Expand Up @@ -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__ */
16 changes: 8 additions & 8 deletions libs/ardour/ardour/msvc_libardour.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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__
4 changes: 1 addition & 3 deletions libs/ardour/ardour/note_fixer.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,4 @@ class NoteFixer : public boost::noncopyable

} /* namespace ARDOUR */

#endif /* __ardour_note_fixer_h__ */


#endif /* __ardour_note_fixer_h__ */
4 changes: 1 addition & 3 deletions libs/ardour/ardour/playlist.h
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,4 @@ class LIBARDOUR_API Playlist : public SessionObject , public boost::enable_share

} /* namespace ARDOUR */

#endif /* __ardour_playlist_h__ */


#endif /* __ardour_playlist_h__ */
4 changes: 2 additions & 2 deletions libs/ardour/ardour/plugin_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ class LIBARDOUR_API PluginManager : public boost::noncopyable {

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;
Expand Down
2 changes: 1 addition & 1 deletion libs/ardour/ardour/port.h
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ class LIBARDOUR_API Port : public boost::noncopyable

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 */
Expand Down
9 changes: 4 additions & 5 deletions libs/ardour/ardour/presentation_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion libs/ardour/ardour/route.h
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ class LIBARDOUR_API Route : public Stripable,
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);

Expand Down
26 changes: 13 additions & 13 deletions libs/ardour/ardour/runtime_functions.h
Original file line number Diff line number Diff line change
Expand Up @@ -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__ */
8 changes: 4 additions & 4 deletions libs/ardour/ardour/soundcloud_upload.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@ class SoundcloudUploader
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;
Expand Down
2 changes: 1 addition & 1 deletion libs/ardour/ardour/soundseq.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class LIBARDOUR_API SoundPlaylist : public EDL::Playlist {

} /* namespace ARDOUR */

#endif /* __soundseq_h__ */
#endif /* __soundseq_h__ */



2 changes: 1 addition & 1 deletion libs/ardour/ardour/transport_master.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions libs/ardour/ardour/vestige/vestige.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 2f91bdf

Please sign in to comment.