mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-07 07:14:56 +01:00
NO-OP: whitespace
This fixes mostly <tab> after <space> and similar <tab> not used for indenting as well as some related code alignment issues.
This commit is contained in:
parent
90a7bef656
commit
31815b5f26
33 changed files with 268 additions and 287 deletions
|
|
@ -86,9 +86,6 @@ PortExportChannelSelector::PortExportChannelSelector (ARDOUR::Session * session,
|
||||||
|
|
||||||
PortExportChannelSelector::~PortExportChannelSelector ()
|
PortExportChannelSelector::~PortExportChannelSelector ()
|
||||||
{
|
{
|
||||||
// if (session) {
|
|
||||||
// session->add_instant_xml (get_state(), false);
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
||||||
|
|
@ -246,17 +246,9 @@ ExportTimespanSelector::construct_label (ARDOUR::Location const * location) cons
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// label += _("from ");
|
|
||||||
|
|
||||||
// label += "<span color=\"#7fff7f\">";
|
|
||||||
label += start;
|
label += start;
|
||||||
// label += "</span>";
|
|
||||||
|
|
||||||
label += _(" to ");
|
label += _(" to ");
|
||||||
|
|
||||||
// label += "<span color=\"#7fff7f\">";
|
|
||||||
label += end;
|
label += end;
|
||||||
// label += "</span>";
|
|
||||||
|
|
||||||
return label;
|
return label;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -305,8 +305,9 @@ std::size_t s1pos, s2pos, n = 0;
|
||||||
s1pos = s1.length();
|
s1pos = s1.length();
|
||||||
s2pos = s2.length();
|
s2pos = s2.length();
|
||||||
while (s1pos-- > 0 && s2pos-- > 0) {
|
while (s1pos-- > 0 && s2pos-- > 0) {
|
||||||
if (!match_or_digit(s1[s1pos], s2[s2pos]) )
|
if (!match_or_digit(s1[s1pos], s2[s2pos])) {
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
n++;
|
n++;
|
||||||
}
|
}
|
||||||
return n;
|
return n;
|
||||||
|
|
|
||||||
|
|
@ -465,7 +465,6 @@ MidiGhostRegion::redisplay_model ()
|
||||||
* representation of it.
|
* representation of it.
|
||||||
* @return Our Event, or 0 if not found.
|
* @return Our Event, or 0 if not found.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
MidiGhostRegion::GhostEvent *
|
MidiGhostRegion::GhostEvent *
|
||||||
MidiGhostRegion::find_event (boost::shared_ptr<NoteType> parent)
|
MidiGhostRegion::find_event (boost::shared_ptr<NoteType> parent)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -35,10 +35,10 @@ G_BEGIN_DECLS
|
||||||
typedef struct _PianoKeyboard PianoKeyboard;
|
typedef struct _PianoKeyboard PianoKeyboard;
|
||||||
typedef struct _PianoKeyboardClass PianoKeyboardClass;
|
typedef struct _PianoKeyboardClass PianoKeyboardClass;
|
||||||
|
|
||||||
#define NNOTES 127
|
#define NNOTES (127)
|
||||||
|
|
||||||
#define OCTAVE_MIN -1
|
#define OCTAVE_MIN (-1)
|
||||||
#define OCTAVE_MAX 7
|
#define OCTAVE_MAX (7)
|
||||||
|
|
||||||
struct PKNote {
|
struct PKNote {
|
||||||
int pressed; /* 1 if key is in pressed down state. */
|
int pressed; /* 1 if key is in pressed down state. */
|
||||||
|
|
@ -73,6 +73,7 @@ struct _PianoKeyboardClass
|
||||||
|
|
||||||
GType piano_keyboard_get_type (void) G_GNUC_CONST;
|
GType piano_keyboard_get_type (void) G_GNUC_CONST;
|
||||||
GtkWidget* piano_keyboard_new (void);
|
GtkWidget* piano_keyboard_new (void);
|
||||||
|
|
||||||
void piano_keyboard_sustain_press (PianoKeyboard *pk);
|
void piano_keyboard_sustain_press (PianoKeyboard *pk);
|
||||||
void piano_keyboard_sustain_release (PianoKeyboard *pk);
|
void piano_keyboard_sustain_release (PianoKeyboard *pk);
|
||||||
void piano_keyboard_set_note_on (PianoKeyboard *pk, int note);
|
void piano_keyboard_set_note_on (PianoKeyboard *pk, int note);
|
||||||
|
|
@ -80,9 +81,9 @@ void piano_keyboard_set_note_off (PianoKeyboard *pk, int note);
|
||||||
void piano_keyboard_set_keyboard_cue (PianoKeyboard *pk, int enabled);
|
void piano_keyboard_set_keyboard_cue (PianoKeyboard *pk, int enabled);
|
||||||
void piano_keyboard_set_monophonic (PianoKeyboard *pk, gboolean monophonic);
|
void piano_keyboard_set_monophonic (PianoKeyboard *pk, gboolean monophonic);
|
||||||
void piano_keyboard_set_octave (PianoKeyboard *pk, int octave);
|
void piano_keyboard_set_octave (PianoKeyboard *pk, int octave);
|
||||||
|
|
||||||
gboolean piano_keyboard_set_keyboard_layout (PianoKeyboard *pk, const char *layout);
|
gboolean piano_keyboard_set_keyboard_layout (PianoKeyboard *pk, const char *layout);
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
#endif /* __PIANO_KEYBOARD_H__ */
|
#endif /* __PIANO_KEYBOARD_H__ */
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -110,8 +110,9 @@ int getXWindowProperty(Window window, Atom atom)
|
||||||
&bytes, // Number of bytes remaining if a partial read
|
&bytes, // Number of bytes remaining if a partial read
|
||||||
&data); // The actual data read
|
&data); // The actual data read
|
||||||
|
|
||||||
if(LXVST_xerror == false && userCount == 1)
|
if (LXVST_xerror == false && userCount == 1) {
|
||||||
result = *(int*)data;
|
result = *(int*)data;
|
||||||
|
}
|
||||||
|
|
||||||
XSetErrorHandler (olderrorhandler);
|
XSetErrorHandler (olderrorhandler);
|
||||||
|
|
||||||
|
|
@ -140,9 +141,10 @@ long getXWindowProperty(Window window, Atom atom)
|
||||||
LXVST_xerror = false;
|
LXVST_xerror = false;
|
||||||
|
|
||||||
/*Use our own Xerror handler while we're in here - in an
|
/*Use our own Xerror handler while we're in here - in an
|
||||||
attempt to stop the brain dead default Xerror behaviour of
|
* attempt to stop the brain dead default Xerror behaviour of
|
||||||
qutting the entire application because of e.g. an invalid
|
* qutting the entire application because of e.g. an invalid
|
||||||
window ID*/
|
* window ID
|
||||||
|
*/
|
||||||
|
|
||||||
XErrorHandler olderrorhandler = XSetErrorHandler (TempErrorHandler);
|
XErrorHandler olderrorhandler = XSetErrorHandler (TempErrorHandler);
|
||||||
|
|
||||||
|
|
@ -159,8 +161,9 @@ long getXWindowProperty(Window window, Atom atom)
|
||||||
&bytes,
|
&bytes,
|
||||||
&data);
|
&data);
|
||||||
|
|
||||||
if(LXVST_xerror == false && userCount == 1)
|
if (LXVST_xerror == false && userCount == 1) {
|
||||||
result = *(long*)data;
|
result = *(long*)data;
|
||||||
|
}
|
||||||
|
|
||||||
XSetErrorHandler (olderrorhandler);
|
XSetErrorHandler (olderrorhandler);
|
||||||
|
|
||||||
|
|
@ -257,10 +260,11 @@ dispatch_x_events (XEvent* event, VSTState* vstfx)
|
||||||
#ifdef LXVST_64BIT
|
#ifdef LXVST_64BIT
|
||||||
long result = getXWindowProperty (PluginUIWindowID, XInternAtom (LXVST_XDisplay, "_XEventProc", false));
|
long result = getXWindowProperty (PluginUIWindowID, XInternAtom (LXVST_XDisplay, "_XEventProc", false));
|
||||||
|
|
||||||
if(result == 0)
|
if (result == 0) {
|
||||||
vstfx->eventProc = NULL;
|
vstfx->eventProc = NULL;
|
||||||
else
|
} else {
|
||||||
vstfx->eventProc = (void (*) (void* event))result;
|
vstfx->eventProc = (void (*) (void* event))result;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
@ -333,8 +337,7 @@ void* gui_event_loop (void* ptr)
|
||||||
|
|
||||||
bool may_sleep = true;
|
bool may_sleep = true;
|
||||||
|
|
||||||
if(LXVST_XDisplay)
|
if (LXVST_XDisplay) {
|
||||||
{
|
|
||||||
/*See if there are any events in the queue*/
|
/*See if there are any events in the queue*/
|
||||||
|
|
||||||
int num_events = XPending (LXVST_XDisplay);
|
int num_events = XPending (LXVST_XDisplay);
|
||||||
|
|
@ -346,14 +349,12 @@ void* gui_event_loop (void* ptr)
|
||||||
|
|
||||||
/*process them if there are any*/
|
/*process them if there are any*/
|
||||||
|
|
||||||
while(num_events)
|
while (num_events) {
|
||||||
{
|
|
||||||
XNextEvent (LXVST_XDisplay, &event);
|
XNextEvent (LXVST_XDisplay, &event);
|
||||||
|
|
||||||
/*Call dispatch events, with the event, for each plugin in the linked list*/
|
/*Call dispatch events, with the event, for each plugin in the linked list*/
|
||||||
|
|
||||||
for (vstfx = vstfx_first; vstfx; vstfx = vstfx->next)
|
for (vstfx = vstfx_first; vstfx; vstfx = vstfx->next) {
|
||||||
{
|
|
||||||
pthread_mutex_lock (&vstfx->lock);
|
pthread_mutex_lock (&vstfx->lock);
|
||||||
|
|
||||||
dispatch_x_events (&event, vstfx);
|
dispatch_x_events (&event, vstfx);
|
||||||
|
|
@ -374,8 +375,7 @@ void* gui_event_loop (void* ptr)
|
||||||
clock2 = g_get_monotonic_time();
|
clock2 = g_get_monotonic_time();
|
||||||
const int64_t elapsed_time_ms = (clock2 - clock1) / 1000;
|
const int64_t elapsed_time_ms = (clock2 - clock1) / 1000;
|
||||||
|
|
||||||
if((LXVST_sched_timer_interval != 0) && elapsed_time_ms >= LXVST_sched_timer_interval)
|
if ((LXVST_sched_timer_interval != 0) && elapsed_time_ms >= LXVST_sched_timer_interval) {
|
||||||
{
|
|
||||||
//printf ("elapsed %d ms ^= %.2f Hz\n", elapsed_time_ms, 1000.0/ (double)elapsed_time_ms); // DEBUG
|
//printf ("elapsed %d ms ^= %.2f Hz\n", elapsed_time_ms, 1000.0/ (double)elapsed_time_ms); // DEBUG
|
||||||
pthread_mutex_lock (&plugin_mutex);
|
pthread_mutex_lock (&plugin_mutex);
|
||||||
|
|
||||||
|
|
@ -445,8 +445,9 @@ again:
|
||||||
|
|
||||||
vstfx->plugin->dispatcher (vstfx->plugin, effEditIdle, 0, 0, NULL, 0);
|
vstfx->plugin->dispatcher (vstfx->plugin, effEditIdle, 0, 0, NULL, 0);
|
||||||
|
|
||||||
if(vstfx->wantIdle)
|
if (vstfx->wantIdle) {
|
||||||
vstfx->plugin->dispatcher (vstfx->plugin, 53, 0, 0, NULL, 0);
|
vstfx->plugin->dispatcher (vstfx->plugin, 53, 0, 0, NULL, 0);
|
||||||
|
}
|
||||||
|
|
||||||
pthread_mutex_unlock (&vstfx->lock);
|
pthread_mutex_unlock (&vstfx->lock);
|
||||||
}
|
}
|
||||||
|
|
@ -520,13 +521,13 @@ int vstfx_init (void* ptr)
|
||||||
will talk to X down this connection - X cannot handle multi-threaded access via
|
will talk to X down this connection - X cannot handle multi-threaded access via
|
||||||
the same Display* */
|
the same Display* */
|
||||||
|
|
||||||
if(LXVST_XDisplay==NULL)
|
if (LXVST_XDisplay == NULL) {
|
||||||
LXVST_XDisplay = XOpenDisplay (NULL); //We might be able to make this open a specific screen etc
|
LXVST_XDisplay = XOpenDisplay (NULL); //We might be able to make this open a specific screen etc
|
||||||
|
}
|
||||||
|
|
||||||
/*Drop out and report the error if we fail to connect to X */
|
/*Drop out and report the error if we fail to connect to X */
|
||||||
|
|
||||||
if(LXVST_XDisplay==NULL)
|
if (LXVST_XDisplay == NULL) {
|
||||||
{
|
|
||||||
vstfx_error ("** ERROR ** VSTFX: Failed opening connection to X");
|
vstfx_error ("** ERROR ** VSTFX: Failed opening connection to X");
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
|
|
|
||||||
|
|
@ -839,15 +839,15 @@ void
|
||||||
Panner2d::cart_to_gtk (CartesianVector& c) const
|
Panner2d::cart_to_gtk (CartesianVector& c) const
|
||||||
{
|
{
|
||||||
/* cartesian coordinate space:
|
/* cartesian coordinate space:
|
||||||
center = 0.0
|
* center = 0.0
|
||||||
dimension = 2.0 * 2.0
|
* dimension = 2.0 * 2.0
|
||||||
increasing y moves up
|
* increasing y moves up
|
||||||
so max values along each axis are -1..+1
|
* so max values along each axis are -1..+1
|
||||||
|
*
|
||||||
GTK uses a coordinate space that is:
|
* GTK uses a coordinate space that is:
|
||||||
top left = 0.0
|
* top left = 0.0
|
||||||
dimension = (radius*2.0) * (radius*2.0)
|
* dimension = (radius*2.0) * (radius*2.0)
|
||||||
increasing y moves down
|
* increasing y moves down
|
||||||
*/
|
*/
|
||||||
const double diameter = radius*2.0;
|
const double diameter = radius*2.0;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -42,15 +42,6 @@ SendUI::SendUI (Gtk::Window* parent, boost::shared_ptr<Send> s, Session* session
|
||||||
{
|
{
|
||||||
assert (_send);
|
assert (_send);
|
||||||
|
|
||||||
_panners.set_panner (s->panner_shell(), s->panner());
|
|
||||||
_gpm.set_controls (boost::shared_ptr<Route>(), s->meter(), s->amp(), s->gain_control());
|
|
||||||
|
|
||||||
_hbox.pack_start (_gpm, true, true);
|
|
||||||
set_name (X_("SendUIFrame"));
|
|
||||||
|
|
||||||
_vbox.set_spacing (5);
|
|
||||||
_vbox.set_border_width (5);
|
|
||||||
|
|
||||||
_vbox.pack_start (_hbox, false, false, false);
|
_vbox.pack_start (_hbox, false, false, false);
|
||||||
_vbox.pack_start (_panners, false, false);
|
_vbox.pack_start (_panners, false, false);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,6 @@ public:
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
void ensureWorkingDir ();
|
void ensureWorkingDir ();
|
||||||
|
|
||||||
std::string doRequest (std::string uri, std::string params);
|
std::string doRequest (std::string uri, std::string params);
|
||||||
|
|
|
||||||
|
|
@ -250,8 +250,8 @@ SpeakerDialog::darea_size_allocate (Gtk::Allocation& alloc)
|
||||||
height = alloc.get_height();
|
height = alloc.get_height();
|
||||||
|
|
||||||
/* The allocation will (should) be rectangualar, but make the basic
|
/* The allocation will (should) be rectangualar, but make the basic
|
||||||
drawing square; space to the right of the square is for over-hanging
|
* drawing square; space to the right of the square is for over-hanging
|
||||||
text labels.
|
* text labels.
|
||||||
*/
|
*/
|
||||||
width = height;
|
width = height;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue