smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

NO-OP whitespace (updated GH PR #357)

Browse source
This commit is contained in:
Thomas Brand 2017-07-01 18:42:24 +02:00 • committed by Robin Gareus
parent f413b83cb9
commit 63ea7b6516
132 changed files with 2774 additions and 2762 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/audio_clock.cc
View file

@ -1723,7 +1723,6 @@ AudioClock::on_motion_notify_event (GdkEventMotion *ev)
if (Keyboard::modifier_state_contains (ev->state,
Keyboard::PrimaryModifier|Keyboard::SecondaryModifier)) {
pixel_frame_scale_factor = 0.025f;
}

6
gtk2_ardour/editor_markers.cc
View file

@ -1604,11 +1604,13 @@ Editor::rename_marker(ArdourMarker *marker)
loc = find_location_from_marker (marker, is_start);
if (!loc)
if (!loc) {
return;
}
if (loc == transport_loop_location() || loc == transport_punch_location() || loc->is_session_range())
if (loc == transport_loop_location() || loc == transport_punch_location() || loc->is_session_range()) {
return;
}
ArdourPrompter dialog (true);
string txt;

41
gtk2_ardour/nsmclient.cc
View file

@ -61,14 +61,16 @@ namespace NSM
Client::~Client ()
{
if ( _st )
if (_st) {
stop();
}
if ( _st )
if (_st) {
lo_server_thread_free (_st);
else
} else {
lo_server_free (_server);
}
}
void
Client::announce (const char *application_name, const char *capabilities, const char *process_name)
@ -143,8 +145,9 @@ namespace NSM
void
Client::check (int timeout)
{
if ( lo_server_wait( _server, timeout ) )
while ( lo_server_recv_noblock( _server, 0 ) ) {}
if (lo_server_wait (_server, timeout)) {
while (lo_server_recv_noblock (_server, 0));
}
}
void
@ -170,8 +173,9 @@ namespace NSM
_server = lo_server_new_with_proto (NULL, proto, NULL);
if ( ! _server )
if (!_server) {
return -1;
}
lo_server_add_method (_server, "/error", "sis", &Client::osc_error, this);
lo_server_add_method (_server, "/reply", "ssss", &Client::osc_announce_reply, this);
@ -195,8 +199,9 @@ namespace NSM
_st = lo_server_thread_new_with_proto (NULL, proto, NULL);
_server = lo_server_thread_get_server (_st);
if ( ! _server || ! _st )
if (! _server || ! _st) {
return -1;
}
lo_server_thread_add_method (_st, "/error", "sis", &Client::osc_error, this);
lo_server_thread_add_method (_st, "/reply", "ssss", &Client::osc_announce_reply, this);
@ -225,13 +230,15 @@ namespace NSM
int r = ((NSM::Client*)user_data)->command_save(&out_msg);
if ( r )
if (r) {
OSC_REPLY_ERR (r, (out_msg ? out_msg : ""));
else
} else {
OSC_REPLY ("OK");
}
if ( out_msg )
if (out_msg) {
free (out_msg);
}
return 0;
}
@ -248,13 +255,15 @@ namespace NSM
int r = ((NSM::Client*)user_data)->command_open (&argv[0]->s, &argv[1]->s, &argv[2]->s, &out_msg);
if ( r )
if (r) {
OSC_REPLY_ERR (r, (out_msg ? out_msg : ""));
else
} else {
OSC_REPLY ("OK");
}
if ( out_msg )
if (out_msg) {
free(out_msg);
}
return 0;
}
@ -272,8 +281,9 @@ namespace NSM
int
Client::osc_error (const char *path, const char *types, lo_arg **argv, int argc, lo_message msg, void *user_data)
{
if ( strcmp( &argv[0]->s, "/nsm/server/announce" ) )
if (strcmp (&argv[0]->s, "/nsm/server/announce")) {
return -1;
}
NSM::Client *nsm = (NSM::Client*)user_data;
@ -288,8 +298,9 @@ namespace NSM
int
Client::osc_announce_reply (const char *path, const char *types, lo_arg **argv, int argc, lo_message msg, void *user_data)
{
if ( strcmp( &argv[0]->s, "/nsm/server/announce" ) )
if (strcmp (&argv[0]->s, "/nsm/server/announce")) {
return -1;
}
NSM::Client *nsm = (NSM::Client*)user_data;