diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-04 14:51:05 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-04 14:51:05 -0400 |
| commit | 4dc63966f0872efe768dad61eb9b8785d06b92d1 (patch) | |
| tree | e54104d57d6c2da7840979181368151fd0819c96 /libs/surfaces | |
| parent | 297e80e020da94a56984b20782584bb1dd96ea34 (diff) | |
globally remove all trailing whitespace from ardour code base.
Paul Davis was responsible for introducing almost all of this.
Diffstat (limited to 'libs/surfaces')
91 files changed, 760 insertions, 760 deletions
diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc index bf6bb25f2c..de50235ee9 100644 --- a/libs/surfaces/control_protocol/basic_ui.cc +++ b/libs/surfaces/control_protocol/basic_ui.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2006 Paul Davis + Copyright (C) 2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser @@ -57,7 +57,7 @@ BasicUI::register_thread (std::string name) } void -BasicUI::access_action ( std::string action_path ) +BasicUI::access_action ( std::string action_path ) { int split_at = action_path.find( "/" ); std::string group = action_path.substr( 0, split_at ); @@ -67,7 +67,7 @@ BasicUI::access_action ( std::string action_path ) } void -BasicUI::loop_toggle () +BasicUI::loop_toggle () { if (session->get_play_loop()) { session->request_play_loop (false); @@ -105,7 +105,7 @@ BasicUI::goto_end () session->goto_end (); } -void +void BasicUI::add_marker (const std::string& markername) { framepos_t where = session->audible_frame(); @@ -143,7 +143,7 @@ BasicUI::transport_play (bool from_last_start) if (session->get_play_loop()) { session->request_play_loop (false); - } + } if (session->get_play_range ()) { session->request_play_range (0); @@ -304,13 +304,13 @@ BasicUI::timecode_time (framepos_t where, Timecode::Time& timecode) session->timecode_time (where, *((Timecode::Time *) &timecode)); } -void +void BasicUI::timecode_to_sample (Timecode::Time& timecode, framepos_t & sample, bool use_offset, bool use_subframes) const { session->timecode_to_sample (*((Timecode::Time*)&timecode), sample, use_offset, use_subframes); } -void +void BasicUI::sample_to_timecode (framepos_t sample, Timecode::Time& timecode, bool use_offset, bool use_subframes) const { session->sample_to_timecode (sample, *((Timecode::Time*)&timecode), use_offset, use_subframes); diff --git a/libs/surfaces/control_protocol/control_protocol.cc b/libs/surfaces/control_protocol/control_protocol.cc index 6ac673925a..b91308c7be 100644 --- a/libs/surfaces/control_protocol/control_protocol.cc +++ b/libs/surfaces/control_protocol/control_protocol.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2006 Paul Davis + Copyright (C) 2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h index 6053614a0c..d62a5da5ad 100644 --- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h +++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2006 Paul Davis + Copyright (C) 2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/libs/surfaces/control_protocol/control_protocol/control_protocol.h b/libs/surfaces/control_protocol/control_protocol/control_protocol.h index 13b8dcad7a..3a0eb41509 100644 --- a/libs/surfaces/control_protocol/control_protocol/control_protocol.h +++ b/libs/surfaces/control_protocol/control_protocol/control_protocol.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2006 Paul Davis + Copyright (C) 2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser @@ -84,7 +84,7 @@ class LIBCONTROLCP_API ControlProtocol : public PBD::Stateful, public PBD::Scope static PBD::Signal1<void,uint32_t> RemoveRouteFromSelection; static PBD::Signal0<void> ClearRouteSelection; - /* signals that one UI (e.g. the GUI) can emit to get all other UI's to + /* signals that one UI (e.g. the GUI) can emit to get all other UI's to respond. Typically this will always be GUI->"others" - the GUI pays no attention to these signals. */ @@ -96,7 +96,7 @@ class LIBCONTROLCP_API ControlProtocol : public PBD::Stateful, public PBD::Scope we imagine most control surfaces being able to control from 1 to N tracks at a time, with a session that may contain 1 to M tracks, where M may be smaller, larger or - equal to N. + equal to N. the control surface has a fixed set of physical controllers which can potentially be mapped onto different tracks/busses @@ -136,7 +136,7 @@ class LIBCONTROLCP_API ControlProtocol : public PBD::Stateful, public PBD::Scope XMLNode& get_state (); int set_state (XMLNode const &, int version); - + static const std::string state_node_name; protected: @@ -163,7 +163,7 @@ extern "C" { bool (*probe)(ControlProtocolDescriptor*); ControlProtocol* (*initialize)(ControlProtocolDescriptor*,Session*); void (*destroy)(ControlProtocolDescriptor*,ControlProtocol*); - + }; } diff --git a/libs/surfaces/control_protocol/control_protocol/types.h b/libs/surfaces/control_protocol/control_protocol/types.h index 9e96383659..8c05953320 100644 --- a/libs/surfaces/control_protocol/control_protocol/types.h +++ b/libs/surfaces/control_protocol/control_protocol/types.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2006 Paul Davis + Copyright (C) 2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/libs/surfaces/control_protocol/control_protocol/visibility.h b/libs/surfaces/control_protocol/control_protocol/visibility.h index 62e3b02913..ef177be191 100644 --- a/libs/surfaces/control_protocol/control_protocol/visibility.h +++ b/libs/surfaces/control_protocol/control_protocol/visibility.h @@ -34,7 +34,7 @@ #define LIBCONTROLCP_API LIBCONTROLCP_DLL_EXPORT #else #define LIBCONTROLCP_API LIBCONTROLCP_DLL_IMPORT -#endif +#endif #define LIBCONTROLCP_LOCAL LIBCONTROLCP_DLL_LOCAL /* These should be used by surfaces/control interfaces. They use (probably) @@ -48,7 +48,7 @@ #define ARDOURSURFACE_API LIBCONTROLCP_DLL_EXPORT #else #define ARDOURSURFACE_API LIBCONTROLCP_DLL_IMPORT -#endif +#endif #define ARDOURSURFACE_LOCAL LIBCONTROLCP_DLL_LOCAL diff --git a/libs/surfaces/frontier/kernel_drivers/tests/tranzport.c b/libs/surfaces/frontier/kernel_drivers/tests/tranzport.c index 2ef5b6c910..96bc3f95ef 100644 --- a/libs/surfaces/frontier/kernel_drivers/tests/tranzport.c +++ b/libs/surfaces/frontier/kernel_drivers/tests/tranzport.c @@ -197,7 +197,7 @@ int tranzport_read(tranzport_t *z, uint8_t *status, uint32_t *buttons, uint8_t * if (val < 0) { printf("errno: %d\n",errno); switch(errno) { - case ENOENT: ; + case ENOENT: ; case ECONNRESET: ; case ESHUTDOWN: printf("dying\n"); exit(1); break; } diff --git a/libs/surfaces/frontier/kernel_drivers/tranzport.c b/libs/surfaces/frontier/kernel_drivers/tranzport.c index b7b6709d56..951be979d0 100644 --- a/libs/surfaces/frontier/kernel_drivers/tranzport.c +++ b/libs/surfaces/frontier/kernel_drivers/tranzport.c @@ -7,7 +7,7 @@ * * Copyright (C) 2004 Greg Kroah-Hartman (greg@kroah.com) * Copyright (C) 2005 Michael Hund <mhund@ld-didactic.de> - * + * * The ldusb driver was, in turn, derived from Lego USB Tower driver * Copyright (C) 2003 David Glance <advidgsf@sourceforge.net> * 2001-2004 Juergen Stuber <starblue@users.sourceforge.net> @@ -25,10 +25,10 @@ */ /* Note: this currently uses a dumb ringbuffer for reads and writes. - * A more optimal driver would cache and kill off outstanding urbs that are + * A more optimal driver would cache and kill off outstanding urbs that are * now invalid, and ignore ones that already were in the queue but valid * as we only have 17 commands for the tranzport. In particular this is - * key for getting lights to flash in time as otherwise many commands + * key for getting lights to flash in time as otherwise many commands * can be buffered up before the light change makes it to the interface. */ @@ -171,7 +171,7 @@ static int write_buffer_size = WRITE_BUFFER_SIZE; module_param(write_buffer_size, int, S_IRUGO); MODULE_PARM_DESC(write_buffer_size, "Write buffer size"); -/* +/* * Increase the interval for debugging purposes. * or set to 1 to use the standard interval from the endpoint descriptors. */ @@ -221,7 +221,7 @@ struct usb_tranzport { int event; /* alternate interface to events */ int wheel; /* - for negative, 0 for none, + for positive */ - int lights; + int lights; unsigned char dump_state; /* 0 if disabled 1 if enabled */ unsigned char enable; /* 0 if disabled 1 if enabled */ unsigned char offline; /* if the device is out of range or asleep */ @@ -391,10 +391,10 @@ static void usb_tranzport_interrupt_in_callback(struct urb *urb) goto resubmit; /* maybe we can recover */ } } - + if (urb->actual_length != 8) { dev_warn(&dev->intf->dev, - "Urb length was %d bytes!! Do something intelligent \n", urb->actual_length); + "Urb length was %d bytes!! Do something intelligent \n", urb->actual_length); } else { dbg_info(&dev->intf->dev, "%s: received: %02x%02x%02x%02x%02x%02x%02x%02x\n", __FUNCTION__, dev->interrupt_in_buffer[0],dev->interrupt_in_buffer[1],dev->interrupt_in_buffer[2],dev->interrupt_in_buffer[3],dev->interrupt_in_buffer[4],dev->interrupt_in_buffer[5],dev->interrupt_in_buffer[6],dev->interrupt_in_buffer[7]); @@ -406,7 +406,7 @@ static void usb_tranzport_interrupt_in_callback(struct urb *urb) if(dev->offline > 0 && dev->interrupt_in_buffer[1] != 0xff) { dev->offline = 0; } if(dev->offline == 0 && dev->interrupt_in_buffer[1] == 0xff) { dev->offline = 1; } -#endif +#endif dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n", __FUNCTION__,dev->ring_head,dev->ring_tail); next_ring_head = (dev->ring_head+1) % ring_buffer_size; @@ -422,17 +422,17 @@ static void usb_tranzport_interrupt_in_callback(struct urb *urb) urb->actual_length); memset(dev->interrupt_in_buffer, 0, urb->actual_length); } - } + } resubmit: /* resubmit if we're still running */ if (dev->interrupt_in_running && dev->intf) { - retval = usb_submit_urb(dev->interrupt_in_urb, GFP_ATOMIC); + retval = usb_submit_urb(dev->interrupt_in_urb, GFP_ATOMIC); if (retval) dev_err(&dev->intf->dev, "usb_submit_urb failed (%d)\n", retval); } - + exit: dev->interrupt_in_done = 1; wake_up_interruptible(&dev->read_wait); @@ -662,7 +662,7 @@ static ssize_t usb_tranzport_read(struct file *file, char __user *buffer, size_t retval = wait_event_interruptible(dev->read_wait, dev->interrupt_in_done); if (retval < 0) { goto unlock_exit; - } + } } dbg_info(&dev->intf->dev, "%s: copying to userspace: %02x%02x%02x%02x%02x%02x%02x%02x\n", @@ -673,10 +673,10 @@ static ssize_t usb_tranzport_read(struct file *file, char __user *buffer, size_t while((c < count) && (dev->ring_tail != dev->ring_head)) { /* This started off in the lower level service routine, and I moved it here. Then my brain died. Not done yet. */ -#if COMPRESS_WHEEL_EVENTS +#if COMPRESS_WHEEL_EVENTS next_tail = (dev->ring_tail+1) % ring_buffer_size; if(dev->compress_wheel) cancompress = 1; - while(dev->ring_head != next_tail && cancompress == 1 ) { + while(dev->ring_head != next_tail && cancompress == 1 ) { newwheel = (*dev->ring_buffer)[next_tail].cmd[6]; oldwheel = (*dev->ring_buffer)[dev->ring_tail].cmd[6]; // if both are wheel events, and no buttons have changes (FIXME, do I have to check?), @@ -688,9 +688,9 @@ static ssize_t usb_tranzport_read(struct file *file, char __user *buffer, size_t __FUNCTION__, (*dev->ring_buffer)[dev->ring_tail].cmd[0],(*dev->ring_buffer)[dev->ring_tail].cmd[1],(*dev->ring_buffer)[dev->ring_tail].cmd[2],(*dev->ring_buffer)[dev->ring_tail].cmd[3],(*dev->ring_buffer)[dev->ring_tail].cmd[4],(*dev->ring_buffer)[dev->ring_tail].cmd[5],(*dev->ring_buffer)[dev->ring_tail].cmd[6],(*dev->ring_buffer)[dev->ring_tail].cmd[7]); - if(((*dev->ring_buffer)[dev->ring_tail].cmd[6] != 0 && - (*dev->ring_buffer)[next_tail].cmd[6] != 0 ) && - ((newwheel > 0 && oldwheel > 0) || + if(((*dev->ring_buffer)[dev->ring_tail].cmd[6] != 0 && + (*dev->ring_buffer)[next_tail].cmd[6] != 0 ) && + ((newwheel > 0 && oldwheel > 0) || (newwheel < 0 && oldwheel < 0)) && ((*dev->ring_buffer)[dev->ring_tail].cmd[2] == (*dev->ring_buffer)[next_tail].cmd[2]) && ((*dev->ring_buffer)[dev->ring_tail].cmd[3] == (*dev->ring_buffer)[next_tail].cmd[3]) && @@ -702,15 +702,15 @@ static ssize_t usb_tranzport_read(struct file *file, char __user *buffer, size_t newwheel += oldwheel; if(oldwheel > 0 && !(newwheel > 0)) { - newwheel = 0x7f; + newwheel = 0x7f; cancompress = 0; } if(oldwheel < 0 && !(newwheel < 0)) { - newwheel = 0x80; + newwheel = 0x80; cancompress = 0; } - (*dev->ring_buffer)[next_tail].cmd[6] = newwheel; + (*dev->ring_buffer)[next_tail].cmd[6] = newwheel; dev->ring_tail = next_tail; next_tail = (dev->ring_tail+1) % ring_buffer_size; } else { @@ -729,7 +729,7 @@ static ssize_t usb_tranzport_read(struct file *file, char __user *buffer, size_t dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n", __FUNCTION__,dev->ring_head,dev->ring_tail); } retval = c; - + #else if (copy_to_user(buffer, &(*dev->ring_buffer)[dev->ring_tail], 8)) { retval = -EFAULT; @@ -916,13 +916,13 @@ static int usb_tranzport_probe(struct usb_interface *intf, const struct usb_devi true_size = min(ring_buffer_size,RING_BUFFER_SIZE); /* FIXME - there are more usb_alloc routines for dma correctness. Needed? */ - dev->ring_buffer = kmalloc((true_size*sizeof(struct tranzport_cmd))+8, GFP_KERNEL); + dev->ring_buffer = kmalloc((true_size*sizeof(struct tranzport_cmd))+8, GFP_KERNEL); if (!dev->ring_buffer) { dev_err(&intf->dev, "Couldn't allocate ring_buffer of size %d\n",true_size); goto error; } - dev->interrupt_in_buffer = kmalloc(dev->interrupt_in_endpoint_size, GFP_KERNEL); + dev->interrupt_in_buffer = kmalloc(dev->interrupt_in_endpoint_size, GFP_KERNEL); if (!dev->interrupt_in_buffer) { dev_err(&intf->dev, "Couldn't allocate interrupt_in_buffer\n"); goto error; diff --git a/libs/surfaces/frontier/tranzport/interface.cc b/libs/surfaces/frontier/tranzport/interface.cc index feb4a951c8..e60524d24c 100644 --- a/libs/surfaces/frontier/tranzport/interface.cc +++ b/libs/surfaces/frontier/tranzport/interface.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -62,7 +62,7 @@ static ControlProtocolDescriptor tranzport_descriptor = { extern "C" { -ControlProtocolDescriptor* +ControlProtocolDescriptor* protocol_descriptor () { return &tranzport_descriptor; } diff --git a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc index f83e55c9d9..773ac2d5a1 100644 --- a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc +++ b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2006 Paul Davis + Copyright (C) 2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,14 +17,14 @@ */ -/* Design notes: The tranzport is a unique device, basically a - 20 lcd gui with 22 shift keys and 8 blinking lights. +/* Design notes: The tranzport is a unique device, basically a + 20 lcd gui with 22 shift keys and 8 blinking lights. As such it has several unique constraints. The device exerts flow control by having a usb write fail. It is pointless to retry madly at that point, - the device is busy, and it's not going to become unbusy very quickly. + the device is busy, and it's not going to become unbusy very quickly. - So writes need to be either "mandatory" or "unreliable", and therein + So writes need to be either "mandatory" or "unreliable", and therein lies the rub, as the kernel can also drop writes, and missing an interrupt in userspace is also generally bad. @@ -81,7 +81,7 @@ static const uint8_t cmd_light_on[] = { 0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00 static const uint8_t cmd_light_off[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; static const uint8_t cmd_write_screen[] = { 0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00 }; -static inline double +static inline double gain_to_slider_position (ARDOUR::gain_t g) { if (g == 0) return 0; @@ -89,7 +89,7 @@ gain_to_slider_position (ARDOUR::gain_t g) } -static inline ARDOUR::gain_t +static inline ARDOUR::gain_t slider_position_to_gain (double pos) { /* XXX Marcus writes: this doesn't seem right to me. but i don't have a better answer ... */ @@ -127,30 +127,30 @@ TranzportControlProtocol::TranzportControlProtocol (Session& s) print(1,0,"!Peace through Music!"); } -void TranzportControlProtocol::light_validate (LightID light) +void TranzportControlProtocol::light_validate (LightID light) { lights_invalid[light] = 0; } -void TranzportControlProtocol::light_invalidate (LightID light) +void TranzportControlProtocol::light_invalidate (LightID light) { lights_invalid[light] = 1; } -void TranzportControlProtocol::lights_validate () +void TranzportControlProtocol::lights_validate () { - memset (lights_invalid, 0, sizeof (lights_invalid)); + memset (lights_invalid, 0, sizeof (lights_invalid)); } -void TranzportControlProtocol::lights_invalidate () +void TranzportControlProtocol::lights_invalidate () { - memset (lights_invalid, 1, sizeof (lights_invalid)); + memset (lights_invalid, 1, sizeof (lights_invalid)); } void TranzportControlProtocol::lights_init() { for (uint32_t i = 0; i < sizeof(lights_current)/sizeof(lights_current[0]); i++) { - lights_invalid[i] = lights_current[i] = + lights_invalid[i] = lights_current[i] = lights_pending[i] = lights_flash[i] = false; } } @@ -165,9 +165,9 @@ TranzportControlProtocol::lights_flush () // Figure out iterators one day soon // for (LightID i = i.start(), i = i.end(); i++) { // if (lights_pending[i] != lights_current[i] || lights_invalid[i]) { - // if (light_set(i, lights_pending[i])) { + // if (light_set(i, lights_pending[i])) { // return i-1; - // } + // } // } //} if ((lights_pending[LightRecord] != lights_current[LightRecord]) || lights_invalid[LightRecord]) { @@ -217,7 +217,7 @@ void TranzportControlProtocol::screen_clear () { const char *blank = " "; - print(0,0,blank); + print(0,0,blank); print(1,0,blank); } @@ -252,35 +252,35 @@ TranzportControlProtocol::screen_flush () for (row = 0; row < 2 && pending == 0; row++) { for (col_base = 0, col = 0; col < 20 && pending == 0; ) { - if ((screen_pending[row][col] != screen_current[row][col]) + if ((screen_pending[row][col] != screen_current[row][col]) || screen_invalid[row][col]) { /* something in this cell is different, so dump the cell to the device. */ - uint8_t cmd[8]; - cmd[0] = 0x00; - cmd[1] = 0x01; - cmd[2] = cell; - cmd[3] = screen_pending[row][col_base]; + uint8_t cmd[8]; + cmd[0] = 0x00; + cmd[1] = 0x01; + cmd[2] = cell; + cmd[3] = screen_pending[row][col_base]; cmd[4] = screen_pending[row][col_base+1]; - cmd[5] = screen_pending[row][col_base+2]; + cmd[5] = screen_pending[row][col_base+2]; cmd[6] = screen_pending[row][col_base+3]; cmd[7] = 0x00; if(write(cmd) != 0) { /* try to update this cell on the next go-round */ #if DEBUG_TRANZPORT > 4 - printf("usb screen update failed for some reason... why? \ncmd and data were %02x %02x %02x %02x %02x %02x %02x %02x\n", - cmd[0],cmd[1],cmd[2], cmd[3], cmd[4], cmd[5],cmd[6],cmd[7]); + printf("usb screen update failed for some reason... why? \ncmd and data were %02x %02x %02x %02x %02x %02x %02x %02x\n", + cmd[0],cmd[1],cmd[2], cmd[3], cmd[4], cmd[5],cmd[6],cmd[7]); #endif pending += 1; // Shouldn't need to do this - // screen_invalid[row][col_base] = screen_invalid[row][col_base+1] = + // screen_invalid[row][col_base] = screen_invalid[row][col_base+1] = // screen_invalid[row][col_base+2] = screen_invalid[row][col_base+3] = true; } else { /* successful write: copy to current cached display */ - screen_invalid[row][col_base] = screen_invalid[row][col_base+1] = + screen_invalid[row][col_base] = screen_invalid[row][col_base+1] = screen_invalid[row][col_base+2] = screen_invalid[row][col_base+3] = false; memcpy (&screen_current[row][col_base], &screen_pending[row][col_base], 4); } @@ -308,7 +308,7 @@ TranzportControlProtocol::screen_flush () // Tranzport specific -void TranzportControlProtocol::invalidate() +void TranzportControlProtocol::invalidate() { lcd_damage(); lights_invalidate(); screen_invalidate(); // one of these days lcds can be fine but screens not } @@ -347,7 +347,7 @@ TranzportControlProtocol::set_active (bool yn) close (); _active = false; cerr << "End tranzport shutdown\n"; - } + } } return 0; @@ -359,13 +359,13 @@ TranzportControlProtocol::show_track_gain () if (route_table[0]) { gain_t g = route_get_gain (0); if ((g != last_track_gain) || lcd_isdamaged(0,9,8)) { - char buf[16]; + char buf[16]; snprintf (buf, sizeof (buf), "%6.1fdB", coefficient_to_dB (route_get_effective_gain (0))); - print (0, 9, buf); + print (0, 9, buf); last_track_gain = g; } } else { - print (0, 9, " "); + print (0, 9, " "); } } @@ -399,7 +399,7 @@ TranzportControlProtocol::next_display_mode () enter_big_meter_mode(); break; - case DisplayConfig: + case DisplayConfig: case DisplayBling: case DisplayBlingMeter: enter_normal_display_mode(); @@ -480,7 +480,7 @@ log_meter (float db) def = (db + 20.0f) * 2.5f + 50.0f; } - /* 115 is the deflection %age that would be + /* 115 is the deflection %age that would be when db=6.0. this is an arbitrary endpoint for our scaling. */ @@ -495,7 +495,7 @@ TranzportControlProtocol::show_meter () if (route_table[0] == 0) { // Principle of least surprise print (0, 0, "No audio to meter!!!"); - print (1, 0, "Select another track"); + print (1, 0, "Select another track"); return; } @@ -531,7 +531,7 @@ TranzportControlProtocol::show_meter () for (i = 0; i < fill; ++i) { buf[i] = 0x07; /* tranzport special code for 4 quadrant LCD block */ - } + } /* add a possible half-step */ @@ -556,7 +556,7 @@ TranzportControlProtocol::show_meter () void TranzportControlProtocol::show_bbt (framepos_t where) -{ +{ if ((where != last_where) || lcd_isdamaged(1,9,8)) { char buf[16]; Timecode::BBT_Time bbt; @@ -618,7 +618,7 @@ TranzportControlProtocol::show_smpte (framepos_t where) print (1, 15, buf); sprintf (buf, "%02" PRIu32, smpte.frames); - print_noretry (1, 18, buf); + print_noretry (1, 18, buf); last_where = where; } @@ -630,7 +630,7 @@ TranzportControlProtocol::_monitor_work (void* arg) return static_cast<TranzportControlProtocol*>(arg)->monitor_work (); } -// I note that these usb specific open, close, probe, read routines are basically +// I note that these usb specific open, close, probe, read routines are basically // pure boilerplate and could easily be abstracted elsewhere #if !HAVE_TRANZPORT_KERNEL_DRIVER @@ -649,7 +649,7 @@ TranzportControlProtocol::probe () for(dev = bus->devices; dev; dev = dev->next) { if (dev->descriptor.idVendor == VENDORID && dev->descriptor.idProduct == PRODUCTID) { - return true; + return true; } } } @@ -689,7 +689,7 @@ TranzportControlProtocol::open_core (struct usb_device* dev) error << _("Tranzport: cannot open USB transport") << endmsg; return -1; } - + if (usb_claim_interface (udev, 0) < 0) { error << _("Tranzport: cannot claim USB interface") << endmsg; usb_close (udev); @@ -727,7 +727,7 @@ TranzportControlProtocol::close () return ret; } -int TranzportControlProtocol::read(uint8_t *buf, uint32_t timeout_override) +int TranzportControlProtocol::read(uint8_t *buf, uint32_t timeout_override) { int val; // Get smarter about handling usb errors soon. Like disconnect @@ -735,7 +735,7 @@ int TranzportControlProtocol::read(uint8_t *buf, uint32_t timeout_override) val = usb_interrupt_read (udev, READ_ENDPOINT, (char *) buf, 8, 10); // pthread_testcancel(); return val; -} +} int @@ -803,18 +803,18 @@ TranzportControlProtocol::write (uint8_t* cmd, uint32_t timeout_override) // We have a state "Unknown" - STOP USING SPACES FOR IT - switching to arrow character // We have another state - no_retry. Misleading, as we still retry on the next pass -// I think it's pointless to keep no_retry and instead we should throttle writes +// I think it's pointless to keep no_retry and instead we should throttle writes // We have an "displayed" screen // We always draw into the pending screen, which could be any of several screens // We have an active screen -// Print arg - we have +// Print arg - we have // setactive // so someday I think we need a screen object. /* screen_flash.clear(); screen_flash.print(0,0,"Undone:"); // Someday pull the undo stack from somewhere -screen_flash.print(1,0,"Nextup:"); +screen_flash.print(1,0,"Nextup:"); if(flash_messages && lcd.getactive() != screen_flash) lcd.setactive(screen_flash,2000); @@ -828,14 +828,14 @@ TranzportControlProtocol::flush () { int pending = 0; if(!(pending = lights_flush())) { - pending = screen_flush(); - } + pending = screen_flush(); + } return pending; } // doing these functions made me realize that screen_invalid should be lcd_isdamaged FIXME soon -bool TranzportControlProtocol::lcd_damage() +bool TranzportControlProtocol::lcd_damage() { screen_invalidate(); return true; @@ -845,7 +845,7 @@ bool TranzportControlProtocol::lcd_damage (int row, int col, int length) { bool result = false; int endcol = col+length-1; - if((endcol > 19)) { endcol = 19; } + if((endcol > 19)) { endcol = 19; } if((row >= 0 && row < 2) && (col >=0 && col < 20)) { for(int c = col; c < endcol; c++) { screen_invalid[row][c] = true; @@ -858,7 +858,7 @@ bool TranzportControlProtocol::lcd_damage (int row, int col, int length) // Gotta switch to bitfields, this is collossally dumb // Still working on the layering, arguably screen_invalid should be lcd_invalid -bool TranzportControlProtocol::lcd_isdamaged () +bool TranzportControlProtocol::lcd_isdamaged () { for(int r = 0; r < 2; r++) { for(int c = 0; c < 20; c++) { @@ -877,7 +877,7 @@ bool TranzportControlProtocol::lcd_isdamaged (int row, int col, int length) { bool result = 0; int endcol = col+length; - if((endcol > 19)) { endcol = 19; } + if((endcol > 19)) { endcol = 19; } if((row >= 0 && row < 2) && (col >=0 && col < 20)) { for(int c = col; c < endcol; c++) { if(screen_invalid[row][c]) { @@ -907,22 +907,22 @@ TranzportControlProtocol::lcd_clear () int TranzportControlProtocol::lcd_flush () { - return 0; + return 0; } -int +int TranzportControlProtocol::lcd_write(uint8_t* cmd, uint32_t timeout_override) { return write(cmd,timeout_override); } -void -TranzportControlProtocol::lcd_fill (uint8_t fill_char) +void +TranzportControlProtocol::lcd_fill (uint8_t fill_char) { } -void -TranzportControlProtocol::lcd_print (int row, int col, const char* text) +void +TranzportControlProtocol::lcd_print (int row, int col, const char* text) { print(row,col,text); } @@ -937,18 +937,18 @@ void TranzportControlProtocol::lcd_print_noretry (int row, int col, const char* void TranzportControlProtocol::lights_on () { - lights_pending[LightRecord] = lights_pending[LightTrackrec] = - lights_pending[LightTrackmute] = lights_pending[LightTracksolo] = - lights_pending[LightAnysolo] = lights_pending[LightLoop] = + lights_pending[LightRecord] = lights_pending[LightTrackrec] = + lights_pending[LightTrackmute] = lights_pending[LightTracksolo] = + lights_pending[LightAnysolo] = lights_pending[LightLoop] = lights_pending[LightPunch] = true; } void TranzportControlProtocol::lights_off () { - lights_pending[LightRecord] = lights_pending[LightTrackrec] = - lights_pending[LightTrackmute] = lights_pending[LightTracksolo] = - lights_pending[LightAnysolo] = lights_pending[LightLoop] = + lights_pending[LightRecord] = lights_pending[LightTrackrec] = + lights_pending[LightTrackmute] = lights_pending[LightTracksolo] = + lights_pending[LightAnysolo] = lights_pending[LightLoop] = lights_pending[LightPunch] = false; } @@ -982,7 +982,7 @@ TranzportControlProtocol::light_set (LightID light, bool offon) } } -int TranzportControlProtocol::rtpriority_set(int priority) +int TranzportControlProtocol::rtpriority_set(int priority) { struct sched_param rtparam; int err; @@ -990,19 +990,19 @@ int TranzportControlProtocol::rtpriority_set(int priority) char *a = (char*) alloca(4096*2); a[0] = 'a'; a[4096] = 'b'; memset (&rtparam, 0, sizeof (rtparam)); rtparam.sched_priority = priority; /* XXX should be relative to audio (JACK) thread */ - // Note - try SCHED_RR with a low limit + // Note - try SCHED_RR with a low limit // - we don't care if we can't write everything this ms // and it will help if we lose the device if ((err = pthread_setschedparam (pthread_self(), SCHED_FIFO, &rtparam)) != 0) { PBD::info << string_compose (_("%1: thread not running with realtime scheduling (%2)"), name(), strerror (errno)) << endmsg; return 1; - } + } return 0; } // Running with realtime privs is bad when you have problems -int TranzportControlProtocol::rtpriority_unset(int priority) +int TranzportControlProtocol::rtpriority_unset(int priority) { struct sched_param rtparam; int err; @@ -1011,7 +1011,7 @@ int TranzportControlProtocol::rtpriority_unset(int priority) if ((err = pthread_setschedparam (pthread_self(), SCHED_FIFO, &rtparam)) != 0) { PBD::info << string_compose (_("%1: can't stop realtime scheduling (%2)"), name(), strerror (errno)) << endmsg; return 1; - } + } PBD::info << string_compose (_("%1: realtime scheduling stopped (%2)"), name(), strerror (errno)) << endmsg; return 0; } @@ -1041,10 +1041,10 @@ TranzportControlProtocol::monitor_work () if (_device_status == STATUS_OFFLINE) { first_time = true; - if(offline++ == 1) { + if(offline++ == 1) { cerr << "Transport has gone offline\n"; } - } else { + } else { offline = 0; // hate writing this } @@ -1075,7 +1075,7 @@ TranzportControlProtocol::monitor_work () // pending = flush(); if(pending == 0) { - pending = flush(); + pending = flush(); } else { if(inflight > 0) { pending = --inflight; // we just did a whole bunch of writes so wait @@ -1084,13 +1084,13 @@ TranzportControlProtocol::monitor_work () } } // pending = 0; - } + } } return (void*) 0; } -int TranzportControlProtocol::lights_show_recording() +int TranzportControlProtocol::lights_show_recording() { // FIXME, flash recording light when recording and transport is moving return lights_show_normal(); @@ -1098,7 +1098,7 @@ int TranzportControlProtocol::lights_show_recording() // gotta do bling next! -int TranzportControlProtocol::lights_show_bling() +int TranzportControlProtocol::lights_show_bling() { switch (bling_mode) { case BlingOff: break; @@ -1111,14 +1111,14 @@ int TranzportControlProtocol::lights_show_bling() return 0; } -int TranzportControlProtocol::lights_show_normal() +int TranzportControlProtocol::lights_show_normal() { /* Track only */ if (route_table[0]) { boost::shared_ptr<AudioTrack> at = boost::dynamic_pointer_cast<AudioTrack> (route_table[0]); lights_pending[LightTrackrec] = at && at->record_enabled(); - lights_pending[LightTrackmute] = route_get_muted(0); + lights_pending[LightTrackmute] = route_get_muted(0); lights_pending[LightTracksolo] = route_get_soloed(0); } else { lights_pending[LightTrackrec] = false; @@ -1128,7 +1128,7 @@ int TranzportControlProtocol::lights_show_normal() /* Global settings */ - lights_pending[LightLoop] = session->get_play_loop(); + lights_pending[LightLoop] = session->get_play_loop(); lights_pending[LightPunch] = Config->get_punch_in() || Config->get_punch_out(); lights_pending[LightRecord] = session->get_record_enabled(); lights_pending[LightAnysolo] = session->soloing(); @@ -1136,9 +1136,9 @@ int TranzportControlProtocol::lights_show_normal() return 0; } -int TranzportControlProtocol::lights_show_tempo() +int TranzportControlProtocol::lights_show_tempo() { - // someday soon fiddle with the lights based on the tempo + // someday soon fiddle with the lights based on the tempo return lights_show_normal(); } @@ -1163,12 +1163,12 @@ TranzportControlProtocol::update_state () case DisplayRecording: lights_show_recording(); - normal_update(); + normal_update(); break; case DisplayRecordingMeter: lights_show_recording(); - show_meter(); + show_meter(); break; case DisplayBling: @@ -1215,7 +1215,7 @@ TranzportControlProtocol::process (uint8_t* buf) // SHIFT + STOP + PLAY for bling mode? // if (button_changes & ButtonPlay & ButtonStop) { - // bling_mode_toggle(); + // bling_mode_toggle(); // } or something like that TRANZPORT_BUTTON_HANDLER(button_event_battery,ButtonBattery); @@ -1289,7 +1289,7 @@ TranzportControlProtocol::button_event_backlight_release (bool shifted) lcd_clear(); last_where += 1; /* force time redisplay */ last_track_gain = FLT_MAX; - normal_update(); // redraw_screen(); + normal_update(); // redraw_screen(); } } @@ -1919,7 +1919,7 @@ TranzportControlProtocol::print_noretry (int row, int col, const char *text) } XMLNode& -TranzportControlProtocol::get_state () +TranzportControlProtocol::get_state () { return ControlProtocol::get_state(); } @@ -1931,14 +1931,14 @@ TranzportControlProtocol::set_state (const XMLNode& node) } int -TranzportControlProtocol::save (char *name) +TranzportControlProtocol::save (char *name) { // Presently unimplemented return 0; } int -TranzportControlProtocol::load (char *name) +TranzportControlProtocol::load (char *name) { // Presently unimplemented return 0; diff --git a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h index 63e6ad4201..39addbbaca 100644 --- a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h +++ b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h @@ -94,7 +94,7 @@ class TranzportControlProtocol : public ARDOUR::ControlProtocol WheelIncrSecond, WheelIncrMinute }; - + enum DisplayMode { DisplayNormal, DisplayRecording, @@ -190,9 +190,9 @@ class TranzportControlProtocol : public ARDOUR::ControlProtocol void screen_invalidate(); int screen_flush(); void screen_clear(); - // bool screen_isuptodate(); // think on this - + // bool screen_isuptodate(); // think on this - - // Commands to write to the lcd + // Commands to write to the lcd int lcd_init(); bool lcd_damage(); diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc index 8c47f73688..f05e138f05 100644 --- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc +++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc @@ -1,6 +1,6 @@ /* Copyright (C) 2006 Paul Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -239,7 +239,7 @@ GenericMidiControlProtocol::set_feedback_interval (microseconds_t ms) _feedback_interval = ms; } -void +void GenericMidiControlProtocol::send_feedback () { /* This is executed in RT "process" context", so no blocking calls @@ -262,7 +262,7 @@ GenericMidiControlProtocol::send_feedback () last_feedback_time = now; } -void +void GenericMidiControlProtocol::_send_feedback () { /* This is executed in RT "process" context", so no blocking calls @@ -523,7 +523,7 @@ GenericMidiControlProtocol::check_used_event (int pos, int control_number) } XMLNode& -GenericMidiControlProtocol::get_state () +GenericMidiControlProtocol::get_state () { XMLNode& node (ControlProtocol::get_state()); char buf[32]; @@ -1070,7 +1070,7 @@ GenericMidiControlProtocol::create_action (const XMLNode& node) prop = node.property (X_("action")); MIDIAction* ma = new MIDIAction (*_input_port->parser()); - + if (ma->init (*this, prop->value(), data, data_size)) { delete ma; return 0; diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.h b/libs/surfaces/generic_midi/generic_midi_control_protocol.h index bb38a48401..c9d11c3e09 100644 --- a/libs/surfaces/generic_midi/generic_midi_control_protocol.h +++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.h @@ -1,6 +1,6 @@ /* Copyright (C) 2006 Paul Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/libs/surfaces/generic_midi/gmcp_gui.cc b/libs/surfaces/generic_midi/gmcp_gui.cc index 3ed37a9eac..773cf36772 100644 --- a/libs/surfaces/generic_midi/gmcp_gui.cc +++ b/libs/surfaces/generic_midi/gmcp_gui.cc @@ -35,7 +35,7 @@ #include "i18n.h" -class GMCPGUI : public Gtk::VBox +class GMCPGUI : public Gtk::VBox { public: GMCPGUI (GenericMidiControlProtocol&); @@ -158,7 +158,7 @@ GMCPGUI::GMCPGUI (GenericMidiControlProtocol& p) threshold_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &GMCPGUI::threshold_changed)); - Gtkmm2ext::UI::instance()->set_tip (threshold_spinner, + Gtkmm2ext::UI::instance()->set_tip (threshold_spinner, string_compose (_("Controls how %1 behaves if the MIDI controller sends discontinuous values"), PROGRAM_NAME)); label = manage (new Label (_("Smoothing:"))); diff --git a/libs/surfaces/generic_midi/interface.cc b/libs/surfaces/generic_midi/interface.cc index 5cd080f2f5..b9b0e36a4d 100644 --- a/libs/surfaces/generic_midi/interface.cc +++ b/libs/surfaces/generic_midi/interface.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libs/surfaces/generic_midi/midiaction.cc b/libs/surfaces/generic_midi/midiaction.cc index 8dfbef9716..08c81b1a52 100644 --- a/libs/surfaces/generic_midi/midiaction.cc +++ b/libs/surfaces/generic_midi/midiaction.cc @@ -1,6 +1,6 @@ /* Copyright (C) 2009-2010 Paul Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/libs/surfaces/generic_midi/midiaction.h b/libs/surfaces/generic_midi/midiaction.h index 5686af32be..5ff022eae3 100644 --- a/libs/surfaces/generic_midi/midiaction.h +++ b/libs/surfaces/generic_midi/midiaction.h @@ -1,6 +1,6 @@ /* Copyright (C) 2009 Paul Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -31,7 +31,7 @@ #include "midiinvokable.h" -namespace Gtk { +namespace Gtk { class Action; } diff --git a/libs/surfaces/generic_midi/midicontrollable.cc b/libs/surfaces/generic_midi/midicontrollable.cc index 21b2b96314..4a9b89de80 100644 --- a/libs/surfaces/generic_midi/midicontrollable.cc +++ b/libs/surfaces/generic_midi/midicontrollable.cc @@ -136,7 +136,7 @@ MIDIControllable::set_controllable (Controllable* c) if (controllable) { controllable->Destroyed.connect (controllable_death_connection, MISSING_INVALIDATOR, - boost::bind (&MIDIControllable::drop_controllable, this), + boost::bind (&MIDIControllable::drop_controllable, this), MidiControlUI::instance()); } } @@ -264,7 +264,7 @@ MIDIControllable::drop_controllable () void MIDIControllable::midi_sense_note (Parser &, EventTwoBytes *msg, bool /*is_on*/) { - if (!controllable) { + if (!controllable) { if (lookup_controllable()) { return; } @@ -289,7 +289,7 @@ MIDIControllable::midi_sense_note (Parser &, EventTwoBytes *msg, bool /*is_on*/) void MIDIControllable::midi_sense_controller (Parser &, EventTwoBytes *msg) { - if (!controllable) { + if (!controllable) { if (lookup_controllable ()) { return; } @@ -382,7 +382,7 @@ MIDIControllable::midi_sense_controller (Parser &, EventTwoBytes *msg) void MIDIControllable::midi_sense_program_change (Parser &, MIDI::byte msg) { - if (!controllable) { + if (!controllable) { if (lookup_controllable ()) { return; } @@ -405,7 +405,7 @@ MIDIControllable::midi_sense_program_change (Parser &, MIDI::byte msg) void MIDIControllable::midi_sense_pitchbend (Parser &, pitchbend_t pb) { - if (!controllable) { + if (!controllable) { if (lookup_controllable ()) { return; } @@ -466,7 +466,7 @@ MIDIControllable::bind_midi (channel_t chn, eventType ev, MIDI::byte additional) if (_momentary) { _parser.channel_note_on[chn_i].connect_same_thread (midi_sense_connection[1], boost::bind (&MIDIControllable::midi_sense_note_on, this, _1, _2)); - } + } _control_description = "MIDI control: NoteOff"; break; diff --git a/libs/surfaces/generic_midi/midicontrollable.h b/libs/surfaces/generic_midi/midicontrollable.h index 1ea13ecb84..5a4a762089 100644 --- a/libs/surfaces/generic_midi/midicontrollable.h +++ b/libs/surfaces/generic_midi/midicontrollable.h @@ -1,6 +1,6 @@ /* Copyright (C) 1998-2006 Paul Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/libs/surfaces/generic_midi/midifunction.cc b/libs/surfaces/generic_midi/midifunction.cc index e2fb317605..e9e875b702 100644 --- a/libs/surfaces/generic_midi/midifunction.cc +++ b/libs/surfaces/generic_midi/midifunction.cc @@ -1,6 +1,6 @@ /* Copyright (C) 2009 Paul Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/libs/surfaces/generic_midi/midifunction.h b/libs/surfaces/generic_midi/midifunction.h index 88aff0ab0a..948775c843 100644 --- a/libs/surfaces/generic_midi/midifunction.h +++ b/libs/surfaces/generic_midi/midifunction.h @@ -1,6 +1,6 @@ /* Copyright (C) 2009 Paul Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -41,7 +41,7 @@ class GenericMidiControlProtocol; class MIDIFunction : public MIDIInvokable { public: - enum Function { + enum Function { NextBank, PrevBank, TransportRoll, @@ -56,7 +56,7 @@ class MIDIFunction : public MIDIInvokable Select, SetBank, /* 2 argument functions: RID, value */ - TrackSetSolo, + TrackSetSolo, TrackSetMute, TrackSetGain, TrackSetRecordEnable, diff --git a/libs/surfaces/generic_midi/midiinvokable.cc b/libs/surfaces/generic_midi/midiinvokable.cc index 42c74553d8..48d8497ce3 100644 --- a/libs/surfaces/generic_midi/midiinvokable.cc +++ b/libs/surfaces/generic_midi/midiinvokable.cc @@ -1,6 +1,6 @@ /* Copyright (C) 2009 Paul Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/libs/surfaces/generic_midi/midiinvokable.h b/libs/surfaces/generic_midi/midiinvokable.h index f374a126a5..bde59b64de 100644 --- a/libs/surfaces/generic_midi/midiinvokable.h +++ b/libs/surfaces/generic_midi/midiinvokable.h @@ -1,6 +1,6 @@ /* Copyright (C) 2009 Paul Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/libs/surfaces/mackie/device_info.cc b/libs/surfaces/mackie/device_info.cc index c59ac84e5f..365ff1db9f 100644 --- a/libs/surfaces/mackie/device_info.cc +++ b/libs/surfaces/mackie/device_info.cc @@ -100,8 +100,8 @@ DeviceInfo::mackie_control_buttons () _global_buttons[Button::UserA] = GlobalButtonInfo ("Rear Panel User Switch 1", "user", 0x66); _global_buttons[Button::UserB] = GlobalButtonInfo ("Rear Panel User Switch 2", "user", 0x67); - //TODO Implement "rear panel external control": a connection for a resistive - //TODO element expression pedal . Message: 0xb0 0x2e 0xVV where 0xVV = external + //TODO Implement "rear panel external control": a connection for a resistive + //TODO element expression pedal . Message: 0xb0 0x2e 0xVV where 0xVV = external //TODO controller position value (0x00 to 0x7f) _strip_buttons[Button::RecEnable] = StripButtonInfo (0x0, "Rec"); @@ -547,7 +547,7 @@ DeviceInfo::reload_device_info () std::ostream& operator<< (std::ostream& os, const Mackie::DeviceInfo& di) { - os << di.name() << ' ' + os << di.name() << ' ' << di.strip_cnt() << ' ' << di.extenders() << ' ' << di.master_position() << ' ' diff --git a/libs/surfaces/mackie/device_info.h b/libs/surfaces/mackie/device_info.h index e272ff252f..c4cbd071c5 100644 --- a/libs/surfaces/mackie/device_info.h +++ b/libs/surfaces/mackie/device_info.h @@ -37,22 +37,22 @@ struct GlobalButtonInfo { std::string label; // visible to user std::string group; // in case we want to present in a GUI int32_t id; // value sent by device - + GlobalButtonInfo () : id (-1) {} GlobalButtonInfo (const std::string& l, const std::string& g, uint32_t i) : label (l), group (g), id (i) {} }; - + struct StripButtonInfo { int32_t base_id; std::string name; - + StripButtonInfo () : base_id (-1) {} StripButtonInfo (uint32_t i, const std::string& n) : base_id (i), name (n) {} }; -class DeviceInfo +class DeviceInfo { public: enum DeviceType { @@ -72,7 +72,7 @@ class DeviceInfo uint32_t strip_cnt () const; uint32_t extenders() const; uint32_t master_position() const; - bool has_two_character_display() const; + bool has_two_character_display() const; bool has_master_fader () const; bool has_timecode_display() const; bool has_global_controls() const; diff --git a/libs/surfaces/mackie/device_profile.cc b/libs/surfaces/mackie/device_profile.cc index 57793ecdbe..c4cd9bf1a8 100644 --- a/libs/surfaces/mackie/device_profile.cc +++ b/libs/surfaces/mackie/device_profile.cc @@ -135,7 +135,7 @@ DeviceProfile::set_state (const XMLNode& node, int /* version */) } /* name is mandatory */ - + if ((child = node.child ("Name")) == 0 || (prop = child->property ("value")) == 0) { return -1; } else { diff --git a/libs/surfaces/mackie/gui.cc b/libs/surfaces/mackie/gui.cc index ac366efbd3..48bfa6cd8a 100644 --- a/libs/surfaces/mackie/gui.cc +++ b/libs/surfaces/mackie/gui.cc @@ -275,7 +275,7 @@ void MackieControlProtocolGUI::build_available_action_menu () { /* build a model of all available actions (needs to be tree structured - * more) + * more) */ available_action_model = TreeStore::create (available_action_columns); @@ -555,7 +555,7 @@ MackieControlProtocolGUI::refresh_function_key_editor () function_key_editor.set_model (function_key_model); } -void +void MackieControlProtocolGUI::action_changed (const Glib::ustring &sPath, const Glib::ustring &text, TreeModelColumnBase col) { // Remove Binding is not in the action map but still valid diff --git a/libs/surfaces/mackie/gui.h b/libs/surfaces/mackie/gui.h index 4c2acc6278..7927d106b0 100644 --- a/libs/surfaces/mackie/gui.h +++ b/libs/surfaces/mackie/gui.h @@ -1,16 +1,16 @@ /* Copyright (C) 2010-2012 Paul Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -57,7 +57,7 @@ class MackieControlProtocolGUI : public Gtk::Notebook Gtk::TreeModelColumn<std::string> name; Gtk::TreeModelColumn<std::string> path; }; - + struct FunctionKeyColumns : public Gtk::TreeModel::ColumnRecord { FunctionKeyColumns() { add (name); diff --git a/libs/surfaces/mackie/jog_wheel.cc b/libs/surfaces/mackie/jog_wheel.cc index 318a6452a0..5d8259f290 100644 --- a/libs/surfaces/mackie/jog_wheel.cc +++ b/libs/surfaces/mackie/jog_wheel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libs/surfaces/mackie/jog_wheel.h b/libs/surfaces/mackie/jog_wheel.h index 5ef3c6c255..568589e54d 100644 --- a/libs/surfaces/mackie/jog_wheel.h +++ b/libs/surfaces/mackie/jog_wheel.h @@ -7,7 +7,7 @@ #include <deque> #include <queue> -namespace ArdourSurface { +namespace ArdourSurface { class MackieControlProtocol; diff --git a/libs/surfaces/mackie/led.cc b/libs/surfaces/mackie/led.cc index 6a090cdc74..d103829a77 100644 --- a/libs/surfaces/mackie/led.cc +++ b/libs/surfaces/mackie/led.cc @@ -40,7 +40,7 @@ Led::factory (Surface& surface, int id, const char* name, Group& group) return l; } -MidiByteArray +MidiByteArray Led::set_state (LedState new_state) { state = new_state; @@ -49,13 +49,13 @@ Led::set_state (LedState new_state) switch (state.state()) { case LedState::on: - msg = 0x7f; + msg = 0x7f; break; case LedState::off: - msg = 0x00; + msg = 0x00; break; case LedState::flashing: - msg = 0x01; + msg = 0x01; break; case LedState::none: return MidiByteArray (); diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h index 1908070a9e..ac1ba53896 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.h +++ b/libs/surfaces/mackie/mackie_control_protocol.h @@ -1,16 +1,16 @@ /* Copyright (C) 2006,2007 John Anderson - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -87,7 +87,7 @@ public: ~MackieControlUIRequest () {} }; -class MackieControlProtocol +class MackieControlProtocol : public ARDOUR::ControlProtocol , public AbstractUI<MackieControlUIRequest> { @@ -194,7 +194,7 @@ class MackieControlProtocol /// this is called to generate the midi to send in response to a button press. void update_led(Mackie::Surface&, Mackie::Button & button, Mackie::LedState); - + void update_global_button (int id, Mackie::LedState); void update_global_led (int id, Mackie::LedState); @@ -225,7 +225,7 @@ class MackieControlProtocol protected: // shut down the surface void close(); - + // This sets up the notifications and sets the // controls to the correct values void update_surfaces(); @@ -243,12 +243,12 @@ class MackieControlProtocol */ typedef std::vector<boost::shared_ptr<ARDOUR::Route> > Sorted; Sorted get_sorted_routes(); - + // bank switching void switch_banks (uint32_t first_remote_id, bool force = false); void prev_track (); void next_track (); - + // also called from poll_automation to update timecode display void update_timecode_display(); @@ -267,9 +267,9 @@ class MackieControlProtocol struct ButtonHandlers { Mackie::LedState (MackieControlProtocol::*press) (Mackie::Button&); Mackie::LedState (MackieControlProtocol::*release) (Mackie::Button&); - + ButtonHandlers (Mackie::LedState (MackieControlProtocol::*p) (Mackie::Button&), - Mackie::LedState (MackieControlProtocol::*r) (Mackie::Button&)) + Mackie::LedState (MackieControlProtocol::*r) (Mackie::Button&)) : press (p) , release (r) {} }; @@ -343,7 +343,7 @@ class MackieControlProtocol typedef std::set<uint32_t> DownButtonList; typedef std::map<ARDOUR::AutomationType,DownButtonList> DownButtonMap; DownButtonMap _down_buttons; - DownButtonList _down_select_buttons; + DownButtonList _down_select_buttons; void pull_route_range (DownButtonList&, ARDOUR::RouteList&); @@ -488,6 +488,6 @@ class MackieControlProtocol Mackie::LedState view_release (Mackie::Button&); }; -} // namespace +} // namespace #endif // ardour_mackie_control_protocol_h diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc index 47fb763602..c2d3680ff0 100644 --- a/libs/surfaces/mackie/mcp_buttons.cc +++ b/libs/surfaces/mackie/mcp_buttons.cc @@ -34,7 +34,7 @@ #include "i18n.h" /* handlers for all buttons, broken into a separate file to avoid clutter in - * mackie_control_protocol.cc + * mackie_control_protocol.cc */ using std::string; @@ -94,11 +94,11 @@ MackieControlProtocol::cmd_alt_release (Button &) return off; } -LedState +LedState MackieControlProtocol::left_press (Button &) { Sorted sorted = get_sorted_routes(); - uint32_t strip_cnt = n_strips (); + uint32_t strip_cnt = n_strips (); DEBUG_TRACE (DEBUG::MackieControl, string_compose ("bank left with current initial = %1 nstrips = %2 tracks/busses = %3\n", _current_initial_bank, strip_cnt, sorted.size())); @@ -112,13 +112,13 @@ MackieControlProtocol::left_press (Button &) return on; } -LedState +LedState MackieControlProtocol::left_release (Button &) { return off; } -LedState +LedState MackieControlProtocol::right_press (Button &) { Sorted sorted = get_sorted_routes(); @@ -141,7 +141,7 @@ MackieControlProtocol::right_press (Button &) return on; } -LedState +LedState MackieControlProtocol::right_release (Button &) { if (zoom_mode()) { @@ -262,7 +262,7 @@ MackieControlProtocol::cursor_down_release (Button&) return off; } -LedState +LedState MackieControlProtocol::channel_left_press (Button &) { Sorted sorted = get_sorted_routes(); @@ -274,13 +274,13 @@ MackieControlProtocol::channel_left_press (Button &) } } -LedState +LedState MackieControlProtocol::channel_left_release (Button &) { return off; } -LedState +LedState MackieControlProtocol::channel_right_press (Button &) { Sorted sorted = get_sorted_routes(); @@ -292,19 +292,19 @@ MackieControlProtocol::channel_right_press (Button &) } } -LedState +LedState MackieControlProtocol::channel_right_release (Button &) { return off; } -Mackie::LedState +Mackie::LedState MackieControlProtocol::zoom_press (Mackie::Button &) { return none; } -Mackie::LedState +Mackie::LedState MackieControlProtocol::zoom_release (Mackie::Button &) { if (_modifier_state & MODIFIER_ZOOM) { @@ -316,7 +316,7 @@ MackieControlProtocol::zoom_release (Mackie::Button &) return (zoom_mode() ? on : off); } -Mackie::LedState +Mackie::LedState MackieControlProtocol::scrub_press (Mackie::Button &) { if (!surfaces.empty()) { @@ -326,7 +326,7 @@ MackieControlProtocol::scrub_press (Mackie::Button &) return none; } -Mackie::LedState +Mackie::LedState MackieControlProtocol::scrub_release (Mackie::Button &) { return none; @@ -349,33 +349,33 @@ MackieControlProtocol::undo_release (Button&) return off; } -LedState +LedState MackieControlProtocol::drop_press (Button &) { session->remove_last_capture(); return on; } -LedState +LedState MackieControlProtocol::drop_release (Button &) { return off; } -LedState +LedState MackieControlProtocol::save_press (Button &) { session->save_state (""); return on; } -LedState +LedState MackieControlProtocol::save_release (Button &) { return off; } -LedState +LedState MackieControlProtocol::timecode_beats_press (Button &) { switch (_timecode_type) { @@ -394,7 +394,7 @@ MackieControlProtocol::timecode_beats_press (Button &) return on; } -LedState +LedState MackieControlProtocol::timecode_beats_release (Button &) { return off; @@ -403,7 +403,7 @@ MackieControlProtocol::timecode_beats_release (Button &) ///////////////////////////////////// // Functions ///////////////////////////////////// -LedState +LedState MackieControlProtocol::marker_press (Button &) { string markername; @@ -414,7 +414,7 @@ MackieControlProtocol::marker_press (Button &) return on; } -LedState +LedState MackieControlProtocol::marker_release (Button &) { return off; @@ -424,20 +424,20 @@ MackieControlProtocol::marker_release (Button &) // Transport Buttons ///////////////////////////////////// -LedState +LedState MackieControlProtocol::stop_press (Button &) { transport_stop (); return on; } -LedState +LedState MackieControlProtocol::stop_release (Button &) { return session->transport_stopped(); } -LedState +LedState MackieControlProtocol::play_press (Button &) { /* if we're already rolling at normal speed, and we're pressed @@ -448,26 +448,26 @@ MackieControlProtocol::play_press (Button &) return none; } -LedState +LedState MackieControlProtocol::play_release (Button &) { return none; } -LedState +LedState MackieControlProtocol::record_press (Button &) { rec_enable_toggle (); return none; } -LedState +LedState MackieControlProtocol::record_release (Button &) { return none; } -LedState +LedState MackieControlProtocol::rewind_press (Button &) { if (main_modifier_state() == MODIFIER_CONTROL) { @@ -478,13 +478,13 @@ MackieControlProtocol::rewind_press (Button &) return none; } -LedState +LedState MackieControlProtocol::rewind_release (Button &) { return none; } -LedState +LedState MackieControlProtocol::ffwd_press (Button &) { if (main_modifier_state() == MODIFIER_CONTROL) { @@ -495,13 +495,13 @@ MackieControlProtocol::ffwd_press (Button &) return none; } -LedState +LedState MackieControlProtocol::ffwd_release (Button &) { return none; } -LedState +LedState MackieControlProtocol::loop_press (Button &) { if (main_modifier_state() & MODIFIER_CONTROL) { @@ -513,13 +513,13 @@ MackieControlProtocol::loop_press (Button &) } } -LedState +LedState MackieControlProtocol::loop_release (Button &) { return none; } -LedState +LedState MackieControlProtocol::clicking_press (Button &) { bool state = !Config->get_clicking(); @@ -527,7 +527,7 @@ MackieControlProtocol::clicking_press (Button &) return state; } -LedState +LedState MackieControlProtocol::clicking_release (Button &) { return Config->get_clicking(); @@ -546,149 +546,149 @@ LedState MackieControlProtocol::global_solo_release (Button &) } LedState -MackieControlProtocol::enter_press (Button &) -{ +MackieControlProtocol::enter_press (Button &) +{ Enter(); /* EMIT SIGNAL */ return off; } LedState -MackieControlProtocol::enter_release (Button &) -{ +MackieControlProtocol::enter_release (Button &) +{ return off; } LedState -MackieControlProtocol::F1_press (Button &) -{ - return off; +MackieControlProtocol::F1_press (Button &) +{ + return off; } LedState -MackieControlProtocol::F1_release (Button &) -{ - return off; +MackieControlProtocol::F1_release (Button &) +{ + return off; } LedState -MackieControlProtocol::F2_press (Button &) -{ - return off; +MackieControlProtocol::F2_press (Button &) +{ + return off; } LedState -MackieControlProtocol::F2_release (Button &) -{ - return off; +MackieControlProtocol::F2_release (Button &) +{ + return off; } LedState -MackieControlProtocol::F3_press (Button &) -{ - return off; +MackieControlProtocol::F3_press (Button &) +{ + return off; } LedState -MackieControlProtocol::F3_release (Button &) -{ - return off; +MackieControlProtocol::F3_release (Button &) +{ + return off; } LedState -MackieControlProtocol::F4_press (Button &) -{ - return off; +MackieControlProtocol::F4_press (Button &) +{ + return off; } LedState -MackieControlProtocol::F4_release (Button &) -{ - return off; +MackieControlProtocol::F4_release (Button &) +{ + return off; } LedState -MackieControlProtocol::F5_press (Button &) -{ - return off; +MackieControlProtocol::F5_press (Button &) +{ + return off; } LedState -MackieControlProtocol::F5_release (Button &) -{ - return off; +MackieControlProtocol::F5_release (Button &) +{ + return off; } LedState -MackieControlProtocol::F6_press (Button &) -{ - return off; +MackieControlProtocol::F6_press (Button &) +{ + return off; } LedState -MackieControlProtocol::F6_release (Button &) -{ - return off; +MackieControlProtocol::F6_release (Button &) +{ + return off; } LedState -MackieControlProtocol::F7_press (Button &) -{ - return off; +MackieControlProtocol::F7_press (Button &) +{ + return off; } LedState -MackieControlProtocol::F7_release (Button &) -{ - return off; +MackieControlProtocol::F7_release (Button &) +{ + return off; } LedState -MackieControlProtocol::F8_press (Button &) -{ +MackieControlProtocol::F8_press (Button &) +{ CloseDialog (); /* EMIT SIGNAL */ - return off; + return off; } LedState -MackieControlProtocol::F8_release (Button &) -{ - return off; +MackieControlProtocol::F8_release (Button &) +{ + return off; } /* UNIMPLEMENTED */ LedState -MackieControlProtocol::pan_press (Button &) -{ - return off; +MackieControlProtocol::pan_press (Button &) +{ + return off; } LedState -MackieControlProtocol::pan_release (Button &) -{ - return none; +MackieControlProtocol::pan_release (Button &) +{ + return none; } LedState -MackieControlProtocol::plugin_press (Button &) -{ - return off; +MackieControlProtocol::plugin_press (Button &) +{ + return off; } LedState -MackieControlProtocol::plugin_release (Button &) -{ - return none; +MackieControlProtocol::plugin_release (Button &) +{ + return none; } LedState -MackieControlProtocol::eq_press (Button &) -{ +MackieControlProtocol::eq_press (Button &) +{ //set_view_mode (EQ); // not implemented yet, turn off (see comments for send button) return off; } LedState -MackieControlProtocol::eq_release (Button &) -{ +MackieControlProtocol::eq_release (Button &) +{ return none; } LedState -MackieControlProtocol::dyn_press (Button &) -{ +MackieControlProtocol::dyn_press (Button &) +{ //set_view_mode (Dynamics); // same as send return off; } LedState -MackieControlProtocol::dyn_release (Button &) -{ +MackieControlProtocol::dyn_release (Button &) +{ return none; } LedState -MackieControlProtocol::flip_press (Button &) -{ +MackieControlProtocol::flip_press (Button &) +{ if (_flip_mode != Normal) { set_flip_mode (Normal); } else { @@ -697,61 +697,61 @@ MackieControlProtocol::flip_press (Button &) return ((_flip_mode != Normal) ? on : off); } LedState -MackieControlProtocol::flip_release (Button &) -{ +MackieControlProtocol::flip_release (Button &) +{ return none; } LedState -MackieControlProtocol::name_value_press (Button &) -{ - return off; +MackieControlProtocol::name_value_press (Button &) +{ + return off; } LedState -MackieControlProtocol::name_value_release (Button &) -{ - return off; +MackieControlProtocol::name_value_release (Button &) +{ + return off; } LedState -MackieControlProtocol::touch_press (Button &) -{ - return off; +MackieControlProtocol::touch_press (Button &) +{ + return off; } LedState -MackieControlProtocol::touch_release (Button &) -{ - return off; +MackieControlProtocol::touch_release (Button &) +{ + return off; } LedState -MackieControlProtocol::cancel_press (Button &) -{ - return off; +MackieControlProtocol::cancel_press (Button &) +{ + return off; } LedState -MackieControlProtocol::cancel_release (Button &) -{ - return off; +MackieControlProtocol::cancel_release (Button &) +{ + return off; } LedState -MackieControlProtocol::user_a_press (Button &) -{ +MackieControlProtocol::user_a_press (Button &) +{ transport_play (session->transport_speed() == 1.0); - return off; + return off; } LedState -MackieControlProtocol::user_a_release (Button &) -{ - return off; +MackieControlProtocol::user_a_release (Button &) +{ + return off; } LedState -MackieControlProtocol::user_b_press (Button &) -{ +MackieControlProtocol::user_b_press (Button &) +{ transport_stop(); - return off; + return off; } LedState -MackieControlProtocol::user_b_release (Button &) -{ - return off; +MackieControlProtocol::user_b_release (Button &) +{ + return off; } LedState @@ -781,51 +781,51 @@ MackieControlProtocol::master_fader_touch_release (Mackie::Button &) return none; } -Mackie::LedState -MackieControlProtocol::read_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::read_press (Mackie::Button&) { _metering_active = !_metering_active; notify_metering_state_changed (); return _metering_active; } -Mackie::LedState -MackieControlProtocol::read_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::read_release (Mackie::Button&) { return _metering_active; } -Mackie::LedState -MackieControlProtocol::write_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::write_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::write_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::write_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::clearsolo_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::clearsolo_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::clearsolo_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::clearsolo_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::track_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::track_press (Mackie::Button&) { return off; } -Mackie::LedState -MackieControlProtocol::track_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::track_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::send_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::send_press (Mackie::Button&) { // code moved here from "sends_press" //set_view_mode (Sends); @@ -835,158 +835,158 @@ MackieControlProtocol::send_press (Mackie::Button&) //return on; return off; } -Mackie::LedState -MackieControlProtocol::send_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::send_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::miditracks_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::miditracks_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::miditracks_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::miditracks_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::inputs_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::inputs_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::inputs_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::inputs_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::audiotracks_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::audiotracks_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::audiotracks_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::audiotracks_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::audioinstruments_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::audioinstruments_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::audioinstruments_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::audioinstruments_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::aux_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::aux_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::aux_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::aux_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::busses_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::busses_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::busses_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::busses_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::outputs_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::outputs_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::outputs_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::outputs_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::user_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::user_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::user_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::user_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::trim_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::trim_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::trim_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::trim_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::latch_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::latch_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::latch_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::latch_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::grp_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::grp_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::grp_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::grp_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::nudge_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::nudge_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::nudge_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::nudge_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::replace_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::replace_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::replace_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::replace_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::click_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::click_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::click_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::click_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::view_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::view_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::view_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::view_release (Mackie::Button&) { return none; } diff --git a/libs/surfaces/mackie/meter.cc b/libs/surfaces/mackie/meter.cc index bc148db185..91de8d6ef6 100644 --- a/libs/surfaces/mackie/meter.cc +++ b/libs/surfaces/mackie/meter.cc @@ -41,7 +41,7 @@ Meter::factory (Surface& surface, int id, const char* name, Group& group) return m; } -void +void Meter::notify_metering_state_changed(Surface& surface, bool transport_is_rolling, bool metering_active) { MidiByteArray msg; diff --git a/libs/surfaces/mackie/meter.h b/libs/surfaces/mackie/meter.h index 9ca5656664..1cbeeac0af 100644 --- a/libs/surfaces/mackie/meter.h +++ b/libs/surfaces/mackie/meter.h @@ -41,7 +41,7 @@ public: MidiByteArray zero(); static Control* factory (Surface&, int id, const char*, Group&); - + void notify_metering_state_changed(Surface& surface, bool transport_is_rolling, bool metering_active); private: diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc index edf034e5c6..ca5c79e9e0 100644 --- a/libs/surfaces/mackie/strip.cc +++ b/libs/surfaces/mackie/strip.cc @@ -108,7 +108,7 @@ Strip::Strip (Surface& s, const std::string& name, int index, const map<Button:: for (map<Button::ID,StripButtonInfo>::const_iterator b = strip_buttons.begin(); b != strip_buttons.end(); ++b) { Button* bb = dynamic_cast<Button*> (Button::factory (*_surface, b->first, b->second.base_id + index, b->second.name, *this)); DEBUG_TRACE (DEBUG::MackieControl, string_compose ("surface %1 strip %2 new button BID %3 id %4 from base %5\n", - _surface->number(), index, Button::id_to_name (bb->bid()), + _surface->number(), index, Button::id_to_name (bb->bid()), bb->id(), b->second.base_id)); } } @@ -118,7 +118,7 @@ Strip::~Strip () /* surface is responsible for deleting all controls */ } -void +void Strip::add (Control & control) { Button* button; @@ -244,7 +244,7 @@ Strip::set_route (boost::shared_ptr<Route> r, bool /*with_messages*/) } } -void +void Strip::notify_all() { if (!_route) { @@ -261,7 +261,7 @@ Strip::notify_all() notify_record_enable_changed (); } -void +void Strip::notify_solo_changed () { if (_route && _solo) { @@ -269,7 +269,7 @@ Strip::notify_solo_changed () } } -void +void Strip::notify_mute_changed () { DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Strip %1 mute changed\n", _index)); @@ -281,7 +281,7 @@ Strip::notify_mute_changed () } } -void +void Strip::notify_record_enable_changed () { if (_route && _recenable) { @@ -289,19 +289,19 @@ Strip::notify_record_enable_changed () } } -void +void Strip::notify_active_changed () { _surface->mcp().refresh_current_bank(); } -void +void Strip::notify_route_deleted () { _surface->mcp().refresh_current_bank(); } -void +void Strip::notify_gain_changed (bool force_update) { if (_route) { @@ -340,7 +340,7 @@ Strip::notify_gain_changed (bool force_update) } } -void +void Strip::notify_property_changed (const PropertyChange& what_changed) { if (!what_changed.contains (ARDOUR::Properties::name)) { @@ -361,7 +361,7 @@ Strip::notify_property_changed (const PropertyChange& what_changed) } } -void +void Strip::notify_panner_azi_changed (bool force_update) { if (_route) { @@ -400,7 +400,7 @@ Strip::notify_panner_azi_changed (bool force_update) } } -void +void Strip::notify_panner_width_changed (bool force_update) { if (_route) { @@ -731,7 +731,7 @@ Strip::redisplay () } } -void +void Strip::update_automation () { ARDOUR::AutoState gain_state = _route->gain_control()->automation_state(); @@ -926,7 +926,7 @@ Strip::reset_display () clear_display_reset (); } - + struct RouteCompareByName { bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) { return a->name().compare (b->name()) < 0; @@ -1135,7 +1135,7 @@ Strip::reset_saved_values () } -void +void Strip::notify_metering_state_changed() { if (!_route || !_meter) { diff --git a/libs/surfaces/mackie/strip.h b/libs/surfaces/mackie/strip.h index b1b00bd8b6..4099dce8af 100644 --- a/libs/surfaces/mackie/strip.h +++ b/libs/surfaces/mackie/strip.h @@ -82,7 +82,7 @@ public: bool locked() const { return _controls_locked; } void gui_selection_changed (const ARDOUR::StrongRouteNotificationList&); - + void notify_metering_state_changed(); private: diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc index a4b1feccad..51b03f86a3 100644 --- a/libs/surfaces/mackie/surface.cc +++ b/libs/surfaces/mackie/surface.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -180,7 +180,7 @@ Surface::set_state (const XMLNode& node, int version) return 0; } -const MidiByteArray& +const MidiByteArray& Surface::sysex_hdr() const { switch (_stype) { @@ -201,7 +201,7 @@ static GlobalControlDefinition mackie_global_controls[] = { { "", 0, Led::factory, "" } }; -void +void Surface::init_controls() { Group* group; @@ -243,7 +243,7 @@ Surface::init_controls() } } -void +void Surface::init_strips (uint32_t n) { const map<Button::ID,StripButtonInfo>& strip_buttons (_mcp.device_info().strip_buttons()); @@ -268,7 +268,7 @@ Surface::setup_master () if ((m = _mcp.get_session().monitor_out()) == 0) { m = _mcp.get_session().master_out(); - } + } if (!m) { return; @@ -318,7 +318,7 @@ Surface::master_gain_changed () _last_master_gain_written = normalized_position; } -float +float Surface::scaled_delta (float delta, float current_speed) { /* XXX needs work before use */ @@ -327,7 +327,7 @@ Surface::scaled_delta (float delta, float current_speed) return ((sign * std::pow (delta + 1.0, 2.0)) + current_speed) / 100.0; } -void +void Surface::display_bank_start (uint32_t current_bank) { if (current_bank == 0) { @@ -339,7 +339,7 @@ Surface::display_bank_start (uint32_t current_bank) } } -void +void Surface::blank_jog_ring () { Control* control = controls_by_device_independent_id[Jog::ID]; @@ -358,13 +358,13 @@ Surface::scrub_scaling_factor () const return 100.0; } -void +void Surface::connect_to_signals () { if (!_connected) { - DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Surface %1 connecting to signals on port %2\n", + DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Surface %1 connecting to signals on port %2\n", number(), _port->input_port().name())); MIDI::Parser* p = _port->input_port().parser(); @@ -396,7 +396,7 @@ Surface::handle_midi_pitchbend_message (MIDI::Parser&, MIDI::pitchbend_t pb, uin * from the MIDI::Parser conveys the fader ID, which was given by the * channel ID in the status byte. * - * Instead, we have used bind() to supply the fader-within-strip ID + * Instead, we have used bind() to supply the fader-within-strip ID * when we connected to the per-channel pitchbend events. */ @@ -433,21 +433,21 @@ Surface::handle_midi_pitchbend_message (MIDI::Parser&, MIDI::pitchbend_t pb, uin } } -void +void Surface::handle_midi_note_on_message (MIDI::Parser &, MIDI::EventTwoBytes* ev) { DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Surface::handle_midi_note_on_message %1 = %2\n", (int) ev->note_number, (int) ev->velocity)); if (_mcp.device_info().no_handshake()) { turn_it_on (); - } + } if (_mcp.device_info().device_type() == DeviceInfo::HUI && ev->note_number == 0 && ev->velocity == 127) { turn_it_on (); } /* fader touch sense is given by "buttons" 0xe..0xe7 and 0xe8 for the - * master. + * master. */ if (ev->note_number >= 0xE0 && ev->note_number <= 0xE8) { @@ -487,7 +487,7 @@ Surface::handle_midi_note_on_message (MIDI::Parser &, MIDI::EventTwoBytes* ev) } } -void +void Surface::handle_midi_controller_message (MIDI::Parser &, MIDI::EventTwoBytes* ev) { DEBUG_TRACE (DEBUG::MackieControl, string_compose ("SurfacePort::handle_midi_controller %1 = %2\n", (int) ev->controller_number, (int) ev->value)); @@ -499,7 +499,7 @@ Surface::handle_midi_controller_message (MIDI::Parser &, MIDI::EventTwoBytes* ev Pot* pot = pots[ev->controller_number]; // bit 6 gives the sign - float sign = (ev->value & 0x40) == 0 ? 1.0 : -1.0; + float sign = (ev->value & 0x40) == 0 ? 1.0 : -1.0; // bits 0..5 give the velocity. we interpret this as "ticks // moved before this message was sent" float ticks = (ev->value & 0x3f); @@ -532,10 +532,10 @@ Surface::handle_midi_controller_message (MIDI::Parser &, MIDI::EventTwoBytes* ev Strip* strip = dynamic_cast<Strip*> (&pot->group()); if (strip) { strip->handle_pot (*pot, delta); - } + } } -void +void Surface::handle_midi_sysex (MIDI::Parser &, MIDI::byte * raw_bytes, size_t count) { MidiByteArray bytes (count, raw_bytes); @@ -547,7 +547,7 @@ Surface::handle_midi_sysex (MIDI::Parser &, MIDI::byte * raw_bytes, size_t count } /* always save the device type ID so that our outgoing sysex messages - * are correct + * are correct */ if (_stype == mcu) { @@ -558,8 +558,8 @@ Surface::handle_midi_sysex (MIDI::Parser &, MIDI::byte * raw_bytes, size_t count switch (bytes[5]) { case 0x01: - /* MCP: Device Ready - LCP: Connection Challenge + /* MCP: Device Ready + LCP: Connection Challenge */ if (bytes[4] == 0x10 || bytes[4] == 0x11) { DEBUG_TRACE (DEBUG::MackieControl, "Logic Control Device connection challenge\n"); @@ -589,7 +589,7 @@ Surface::handle_midi_sysex (MIDI::Parser &, MIDI::byte * raw_bytes, size_t count } } -static MidiByteArray +static MidiByteArray calculate_challenge_response (MidiByteArray::iterator begin, MidiByteArray::iterator end) { MidiByteArray l; @@ -609,7 +609,7 @@ calculate_challenge_response (MidiByteArray::iterator begin, MidiByteArray::iter } // not used right now -MidiByteArray +MidiByteArray Surface::host_connection_query (MidiByteArray & bytes) { MidiByteArray response; @@ -635,7 +635,7 @@ Surface::host_connection_query (MidiByteArray & bytes) } // not used right now -MidiByteArray +MidiByteArray Surface::host_connection_confirmation (const MidiByteArray & bytes) { DEBUG_TRACE (DEBUG::MackieControl, string_compose ("host_connection_confirmation: %1\n", bytes)); @@ -673,7 +673,7 @@ Surface::turn_it_on () } } -void +void Surface::write_sysex (const MidiByteArray & mba) { if (mba.empty()) { @@ -685,7 +685,7 @@ Surface::write_sysex (const MidiByteArray & mba) _port->write (buf); } -void +void Surface::write_sysex (MIDI::byte msg) { MidiByteArray buf; @@ -698,7 +698,7 @@ Surface::n_strips (bool with_locked_strips) const { if (with_locked_strips) { return strips.size(); - } + } uint32_t n = 0; @@ -782,7 +782,7 @@ Surface::redisplay () } void -Surface::write (const MidiByteArray& data) +Surface::write (const MidiByteArray& data) { if (_active) { _port->write (data); @@ -819,7 +819,7 @@ Surface::map_routes (const vector<boost::shared_ptr<Route> >& routes) } -static char +static char translate_seven_segment (char achar) { achar = toupper (achar); @@ -876,7 +876,7 @@ Surface::display_timecode (const std::string & timecode, const std::string & las } // pad to 10 characters - while (local_timecode.length() < 10) { + while (local_timecode.length() < 10) { local_timecode += " "; } @@ -1012,7 +1012,7 @@ Surface::route_is_locked_to_strip (boost::shared_ptr<Route> r) const return false; } -void +void Surface::notify_metering_state_changed() { for (Strips::const_iterator s = strips.begin(); s != strips.end(); ++s) { @@ -1026,7 +1026,7 @@ Surface::reset () if (_port) { /* reset msg for Mackie Control */ MidiByteArray msg (8, MIDI::sysex, 0x00, 0x00, 0x66, 0x14, 0x08, 0x00, MIDI::eox); - _port->write (msg); + _port->write (msg); msg[4] = 0x15; /* reset Mackie XT */ _port->write (msg); msg[4] = 0x10; /* reset Logic Control */ @@ -1042,7 +1042,7 @@ Surface::toggle_backlight () if (_port) { int onoff = random() %2; MidiByteArray msg (8, MIDI::sysex, 0x00, 0x00, 0x66, 0x14, 0x0a, onoff, MIDI::eox); - _port->write (msg); + _port->write (msg); msg[4] = 0x15; /* reset Mackie XT */ _port->write (msg); msg[4] = 0x10; /* reset Logic Control */ @@ -1057,7 +1057,7 @@ Surface::recalibrate_faders () { if (_port) { MidiByteArray msg (8, MIDI::sysex, 0x00, 0x00, 0x66, 0x14, 0x09, 0x00, MIDI::eox); - _port->write (msg); + _port->write (msg); msg[4] = 0x15; /* reset Mackie XT */ _port->write (msg); msg[4] = 0x10; /* reset Logic Control */ @@ -1080,7 +1080,7 @@ Surface::set_touch_sensitivity (int sensitivity) for (int fader = 0; fader < 9; ++fader) { msg[6] = fader; - _port->write (msg); + _port->write (msg); msg[4] = 0x15; /* reset Mackie XT */ _port->write (msg); msg[4] = 0x10; /* reset Logic Control */ diff --git a/libs/surfaces/mackie/surface.h b/libs/surfaces/mackie/surface.h index a3d874a89a..7ca620d3b6 100644 --- a/libs/surfaces/mackie/surface.h +++ b/libs/surfaces/mackie/surface.h @@ -154,7 +154,7 @@ public: void next_jog_mode (); void set_jog_mode (Mackie::JogWheel::Mode); - + void notify_metering_state_changed(); void turn_it_on (); diff --git a/libs/surfaces/mackie/surface_port.cc b/libs/surfaces/mackie/surface_port.cc index 3d7c1d66c6..4a8cff6e16 100644 --- a/libs/surfaces/mackie/surface_port.cc +++ b/libs/surfaces/mackie/surface_port.cc @@ -151,7 +151,7 @@ string fetch_errmsg (int error_number) return msg; } -int +int SurfacePort::write (const MidiByteArray & mba) { if (mba.empty()) { @@ -190,7 +190,7 @@ SurfacePort::write (const MidiByteArray & mba) return 0; } -ostream & +ostream & Mackie::operator << (ostream & os, const SurfacePort & port) { os << "{ "; diff --git a/libs/surfaces/mackie/surface_port.h b/libs/surfaces/mackie/surface_port.h index 1239bc533c..d22e46f4bf 100644 --- a/libs/surfaces/mackie/surface_port.h +++ b/libs/surfaces/mackie/surface_port.h @@ -50,12 +50,12 @@ class Surface; Make a relationship between a midi port and a Mackie device. */ -class SurfacePort +class SurfacePort { public: SurfacePort (Mackie::Surface&); virtual ~SurfacePort(); - + /// an easier way to output bytes via midi int write (const MidiByteArray&); diff --git a/libs/surfaces/mackie/timer.h b/libs/surfaces/mackie/timer.h index dd6066c87b..31470a92c3 100644 --- a/libs/surfaces/mackie/timer.h +++ b/libs/surfaces/mackie/timer.h @@ -1,16 +1,16 @@ /* Copyright (C) 1998, 1999, 2000, 2007 John Anderson - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU Library General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/libs/surfaces/mackie/types.cc b/libs/surfaces/mackie/types.cc index f3a05e0f3c..9ee0431cd9 100644 --- a/libs/surfaces/mackie/types.cc +++ b/libs/surfaces/mackie/types.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libs/surfaces/mackie/types.h b/libs/surfaces/mackie/types.h index 3095248a1a..fd1b225c65 100644 --- a/libs/surfaces/mackie/types.h +++ b/libs/surfaces/mackie/types.h @@ -23,9 +23,9 @@ namespace ArdourSurface { namespace Mackie { -enum surface_type_t { - mcu, - ext, +enum surface_type_t { + mcu, + ext, }; /** diff --git a/libs/surfaces/osc/interface.cc b/libs/surfaces/osc/interface.cc index 236a1408b1..568e03edff 100644 --- a/libs/surfaces/osc/interface.cc +++ b/libs/surfaces/osc/interface.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Paul Davis + * Copyright (C) 2009 Paul Davis * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ #include "ardour/rc_configuration.h" diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index 732da3a05a..f046053091 100644 --- a/libs/surfaces/osc/osc.h +++ b/libs/surfaces/osc/osc.h @@ -1,20 +1,20 @@ /* * Copyright (C) 2006-2009 Paul Davis - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * + * */ #ifndef ardour_osc_h @@ -207,7 +207,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest> name (argv[0]->arg1type, argv[1]->arg2type,argv[2]->arg3type,argv[3]->arg4type); \ } \ return 0; \ - } + } PATH_CALLBACK2(locate,i,i); PATH_CALLBACK2(loop_location,i,i); @@ -223,7 +223,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest> PATH_CALLBACK3(route_set_send_gain_abs,i,i,f); PATH_CALLBACK3(route_set_send_gain_dB,i,i,f); PATH_CALLBACK4(route_plugin_parameter,i,i,i,f); - PATH_CALLBACK3(route_plugin_parameter_print,i,i,i); + PATH_CALLBACK3(route_plugin_parameter_print,i,i,i); int route_mute (int rid, int yn); int route_solo (int rid, int yn); diff --git a/libs/surfaces/osc/osc_controllable.cc b/libs/surfaces/osc/osc_controllable.cc index 9b87ddbb64..ce86c8aee7 100644 --- a/libs/surfaces/osc/osc_controllable.cc +++ b/libs/surfaces/osc/osc_controllable.cc @@ -1,6 +1,6 @@ /* Copyright (C) 2009 Paul Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -74,7 +74,7 @@ OSCControllable::send_change_message () /*------------------------------------------------------------*/ -OSCRouteControllable::OSCRouteControllable (lo_address a, const std::string& p, +OSCRouteControllable::OSCRouteControllable (lo_address a, const std::string& p, boost::shared_ptr<Controllable> c, boost::shared_ptr<Route> r) : OSCControllable (a, p, c) , _route (r) diff --git a/libs/surfaces/osc/osc_controllable.h b/libs/surfaces/osc/osc_controllable.h index 828c3769f5..accec04515 100644 --- a/libs/surfaces/osc/osc_controllable.h +++ b/libs/surfaces/osc/osc_controllable.h @@ -1,6 +1,6 @@ /* Copyright (C) 2009 Paul Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -57,8 +57,8 @@ class OSCRouteControllable : public OSCControllable { public: - OSCRouteControllable (lo_address addr, const std::string& path, - boost::shared_ptr<PBD::Controllable>, + OSCRouteControllable (lo_address addr, const std::string& path, + boost::shared_ptr<PBD::Controllable>, boost::shared_ptr<ARDOUR::Route>); ~OSCRouteControllable (); diff --git a/libs/surfaces/osc/osc_route_observer.cc b/libs/surfaces/osc/osc_route_observer.cc index fcd7b560cb..b7075e1d27 100644 --- a/libs/surfaces/osc/osc_route_observer.cc +++ b/libs/surfaces/osc/osc_route_observer.cc @@ -1,6 +1,6 @@ /* Copyright (C) 2009 Paul Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/libs/surfaces/osc/osc_route_observer.h b/libs/surfaces/osc/osc_route_observer.h index d491c8bf1b..b83b0f1e64 100644 --- a/libs/surfaces/osc/osc_route_observer.h +++ b/libs/surfaces/osc/osc_route_observer.h @@ -1,6 +1,6 @@ /* Copyright (C) 2009 Paul Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/libs/surfaces/tranzport/bling.cc b/libs/surfaces/tranzport/bling.cc index c60b699f3d..ea2ef56d42 100644 --- a/libs/surfaces/tranzport/bling.cc +++ b/libs/surfaces/tranzport/bling.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ -/* The Bling class theoretically knows nothing about the device it's blinging +/* The Bling class theoretically knows nothing about the device it's blinging and depends on the overlying implementation to tell it about the format of the device. Maybe this will become a template or people will inherit from it */ @@ -75,8 +75,8 @@ protected: // make absolutely sure we have the pointer to the interface // something like this -#define BLING_INTFA(a) (intf)? 0:intf->a -#define BLING_INTF(a) { if (intf) { intf->a; } else { return 0; } } +#define BLING_INTFA(a) (intf)? 0:intf->a +#define BLING_INTF(a) { if (intf) { intf->a; } else { return 0; } } // Should any of these bother to return a status code? diff --git a/libs/surfaces/tranzport/button_events.cc b/libs/surfaces/tranzport/button_events.cc index 37c62a6ab7..1b070b3281 100644 --- a/libs/surfaces/tranzport/button_events.cc +++ b/libs/surfaces/tranzport/button_events.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ #include <tranzport_common.h> @@ -66,7 +66,7 @@ TranzportControlProtocol::button_event_trackleft_press (bool shifted) { prev_track (); // not really the right layer for this - if(display_mode == DisplayBigMeter) { + if(display_mode == DisplayBigMeter) { if (route_table[0] != 0) { notify(route_get_name (0).substr (0, 15).c_str()); } @@ -81,9 +81,9 @@ TranzportControlProtocol::button_event_trackleft_release (bool shifted) void TranzportControlProtocol::button_event_trackright_press (bool shifted) { - next_track (); + next_track (); // not really the right layer for this - if(display_mode == DisplayBigMeter) { + if(display_mode == DisplayBigMeter) { if (route_table[0] != 0) { notify(route_get_name (0).substr (0, 15).c_str()); } @@ -372,9 +372,9 @@ TranzportControlProtocol::button_event_footswitch_release (bool shifted) void button_event_mute (bool pressed, bool shifted) { static int was_pressed = 0; - if((!pressed && !was_pressed) || pressed) { + if((!pressed && !was_pressed) || pressed) { was_pressed = 1; - } + } was_pressed = 0; } diff --git a/libs/surfaces/tranzport/button_yn.cc b/libs/surfaces/tranzport/button_yn.cc index 04b6ab5668..56d6d379cf 100644 --- a/libs/surfaces/tranzport/button_yn.cc +++ b/libs/surfaces/tranzport/button_yn.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ /* placeholder for button definitions for user edits like yes/no */ diff --git a/libs/surfaces/tranzport/buttons.cc b/libs/surfaces/tranzport/buttons.cc index df5a88e6d9..99bcccc902 100644 --- a/libs/surfaces/tranzport/buttons.cc +++ b/libs/surfaces/tranzport/buttons.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ #include "tranzport_control_protocol.h" @@ -33,15 +33,15 @@ TranzportControlProtocol::process (uint8_t* buf) _device_status = buf[1]; -#if DEBUG_TRANZPORT > 10 +#if DEBUG_TRANZPORT > 10 // Perhaps the device can go offline due to flow control, print command bits to see if we have anything interesting if(_device_status == STATUS_ONLINE) { - printf("ONLINE : %02x %02x %02x %02x %02x %02x %02x %02x\n", - buf[0],buf[1],buf[2], buf[3], buf[4], buf[5],buf[6],buf[7]); + printf("ONLINE : %02x %02x %02x %02x %02x %02x %02x %02x\n", + buf[0],buf[1],buf[2], buf[3], buf[4], buf[5],buf[6],buf[7]); } if(_device_status == STATUS_OFFLINE) { - printf("OFFLINE : %02x %02x %02x %02x %02x %02x %02x %02x\n", - buf[0],buf[1],buf[2], buf[3], buf[4], buf[5],buf[6],buf[7]); + printf("OFFLINE : %02x %02x %02x %02x %02x %02x %02x %02x\n", + buf[0],buf[1],buf[2], buf[3], buf[4], buf[5],buf[6],buf[7]); } if(_device_status != STATUS_OK) { return 1; } @@ -84,7 +84,7 @@ TranzportControlProtocol::process (uint8_t* buf) // SHIFT + STOP + PLAY for bling mode? // if (button_changes & ButtonPlay & ButtonStop) { - // bling_mode_toggle(); + // bling_mode_toggle(); // } or something like that TRANZPORT_BUTTON_HANDLER(button_event_battery,ButtonBattery); diff --git a/libs/surfaces/tranzport/general.cc b/libs/surfaces/tranzport/general.cc index f8a548af6a..d051b36d1d 100644 --- a/libs/surfaces/tranzport/general.cc +++ b/libs/surfaces/tranzport/general.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ #include <tranzport_common.h> @@ -33,7 +33,7 @@ using namespace PBD; #include <slider_gain.h> // FIXME, flash recording light when recording and transport is moving -int TranzportControlProtocol::lights_show_recording() +int TranzportControlProtocol::lights_show_recording() { return lights_show_normal(); } @@ -67,7 +67,7 @@ void TranzportControlProtocol::show_notify() { // Need more bling! -int TranzportControlProtocol::lights_show_bling() +int TranzportControlProtocol::lights_show_bling() { switch (bling_mode) { case BlingOff: break; @@ -77,14 +77,14 @@ int TranzportControlProtocol::lights_show_bling() case BlingRows: break; // light each row in sequence case BlingFlashAll: break; // Flash everything randomly case BlingEnter: lights_on(); // Show intro - case BlingExit: + case BlingExit: lights_off(); break; } return 0; } -int TranzportControlProtocol::screen_show_bling() +int TranzportControlProtocol::screen_show_bling() { switch (bling_mode) { case BlingOff: break; @@ -97,20 +97,20 @@ int TranzportControlProtocol::screen_show_bling() print(0,0,"!!Welcome to Ardour!"); print(1,0,"Peace through Music!"); break; - case BlingExit: + case BlingExit: break; } return 0; } -int TranzportControlProtocol::lights_show_normal() +int TranzportControlProtocol::lights_show_normal() { /* Track only */ if (route_table[0]) { boost::shared_ptr<AudioTrack> at = boost::dynamic_pointer_cast<AudioTrack> (route_table[0]); lights_pending[LightTrackrec] = at && at->record_enabled(); - lights_pending[LightTrackmute] = route_get_muted(0); + lights_pending[LightTrackmute] = route_get_muted(0); lights_pending[LightTracksolo] = route_get_soloed(0); } else { lights_pending[LightTrackrec] = false; @@ -120,7 +120,7 @@ int TranzportControlProtocol::lights_show_normal() /* Global settings */ - lights_pending[LightLoop] = session->get_play_loop(); + lights_pending[LightLoop] = session->get_play_loop(); lights_pending[LightPunch] = session->config.get_punch_in() || session->config.get_punch_out(); lights_pending[LightRecord] = session->get_record_enabled(); lights_pending[LightAnysolo] = session->soloing(); @@ -128,9 +128,9 @@ int TranzportControlProtocol::lights_show_normal() return 0; } -int TranzportControlProtocol::lights_show_tempo() +int TranzportControlProtocol::lights_show_tempo() { - // someday soon fiddle with the lights more sanely based on the tempo + // someday soon fiddle with the lights more sanely based on the tempo return lights_show_normal(); } @@ -160,7 +160,7 @@ TranzportControlProtocol::update_state () case DisplayRecordingMeter: lights_show_recording(); - show_meter(); + show_meter(); break; case DisplayBling: @@ -190,7 +190,7 @@ TranzportControlProtocol::prev_marker () session->goto_start (); notify("START"); } - + } void @@ -327,7 +327,7 @@ TranzportControlProtocol::print_noretry (int row, int col, const char *text) screen_invalid = mask; } -void TranzportControlProtocol::invalidate() +void TranzportControlProtocol::invalidate() { lcd_damage(); lights_invalidate(); screen_invalidate(); // one of these days lcds can be fine but screens not } diff --git a/libs/surfaces/tranzport/init.cc b/libs/surfaces/tranzport/init.cc index 289d4d79a7..3a01185407 100644 --- a/libs/surfaces/tranzport/init.cc +++ b/libs/surfaces/tranzport/init.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * */ #include <tranzport_common.h> @@ -41,26 +41,26 @@ TranzportControlProtocol::~TranzportControlProtocol () set_active (false); } -int TranzportControlProtocol::rtpriority_set(int priority) +int TranzportControlProtocol::rtpriority_set(int priority) { struct sched_param rtparam; int err; char *a = (char*) alloca(4096*2); a[0] = 'a'; a[4096] = 'b'; memset (&rtparam, 0, sizeof (rtparam)); rtparam.sched_priority = priority; /* XXX should be relative to audio (JACK) thread */ - // Note - try SCHED_RR with a low limit + // Note - try SCHED_RR with a low limit // - we don't care if we can't write everything this ms // and it will help if we lose the device if ((err = pthread_setschedparam (pthread_self(), SCHED_FIFO, &rtparam)) != 0) { PBD::info << string_compose (_("%1: thread not running with realtime scheduling (%2)"), name(), strerror (errno)) << endmsg; return 1; - } + } return 0; } // Running with realtime privs is bad when you have problems -int TranzportControlProtocol::rtpriority_unset(int priority) +int TranzportControlProtocol::rtpriority_unset(int priority) { struct sched_param rtparam; int err; @@ -69,7 +69,7 @@ int TranzportControlProtocol::rtpriority_unset(int priority) if ((err = pthread_setschedparam (pthread_self(), SCHED_FIFO, &rtparam)) != 0) { PBD::info << string_compose (_("%1: can't stop realtime scheduling (%2)"), name(), strerror (errno)) << endmsg; return 1; - } + } PBD::info << string_compose (_("%1: realtime scheduling stopped (%2)"), name(), strerror (errno)) << endmsg; return 0; } @@ -191,13 +191,13 @@ TranzportControlProtocol::monitor_work () /* bInterval for this beastie is 10ms */ if (_device_status == STATUS_OFFLINE) { - first_time = true; offline++; + first_time = true; offline++; #if TRANZPORT_DEBUG > 3 - if(offline == 1) { + if(offline == 1) { cerr << "Transport has gone offline\n"; } #endif - } else { + } else { offline = 0; // hate writing this } unsigned int s = (last_write_error == 0) | ((last_read_error == 0) << 1); @@ -218,8 +218,8 @@ TranzportControlProtocol::monitor_work () #if DEBUG_TRANZPORT_BITS > 99 if (val != 8) { printf("val = %d errno = %d\n",val,errno); - buf[0] = buf[1] = buf[2] = buf[3] = - buf[4] = buf[5] = buf[6] = buf[7] = + buf[0] = buf[1] = buf[2] = buf[3] = + buf[4] = buf[5] = buf[6] = buf[7] = buf[8] = 0; } #endif @@ -246,44 +246,44 @@ TranzportControlProtocol::monitor_work () #if DEBUG_TRANZPORT_BITS > 10 // Perhaps an online message indicates something - if(_device_status != buf[1]) { - printf("WTF- val: %d, device status != buf! %d != %d \n",val,_device_status,buf[1]); _device_status = buf[1]; + if(_device_status != buf[1]) { + printf("WTF- val: %d, device status != buf! %d != %d \n",val,_device_status,buf[1]); _device_status = buf[1]; } #endif - + } - + #if DEBUG_TRANZPORT_BITS > 10 if(val == 8) { if(_device_status == STATUS_ONLINE) { - printf("ONLINE : %02x %02x %02x %02x %02x %02x %02x %02x\n", - buf[0],buf[1],buf[2], buf[3], buf[4], buf[5],buf[6],buf[7]); + printf("ONLINE : %02x %02x %02x %02x %02x %02x %02x %02x\n", + buf[0],buf[1],buf[2], buf[3], buf[4], buf[5],buf[6],buf[7]); } if(_device_status == STATUS_OFFLINE) { - printf("OFFLINE : %02x %02x %02x %02x %02x %02x %02x %02x\n", - buf[0],buf[1],buf[2], buf[3], buf[4], buf[5],buf[6],buf[7]); + printf("OFFLINE : %02x %02x %02x %02x %02x %02x %02x %02x\n", + buf[0],buf[1],buf[2], buf[3], buf[4], buf[5],buf[6],buf[7]); } if(_device_status == STATUS_OK) { - printf("OK : %02x %02x %02x %02x %02x %02x %02x %02x\n", - buf[0],buf[1],buf[2], buf[3], buf[4], buf[5],buf[6],buf[7]); + printf("OK : %02x %02x %02x %02x %02x %02x %02x %02x\n", + buf[0],buf[1],buf[2], buf[3], buf[4], buf[5],buf[6],buf[7]); } - + } - + #endif - + /* update whatever needs updating */ - if(last_write_error == 0 && (_device_status == STATUS_ONLINE || _device_status == STATUS_OK)) { + if(last_write_error == 0 && (_device_status == STATUS_ONLINE || _device_status == STATUS_OK)) { update_state (); - + /* still struggling with a good means of exerting flow control without having to create threads */ // pending = flush(); - + if(pending == 0) { - pending = flush(); + pending = flush(); } else { if(inflight > 0) { pending = --inflight; // we just did a whole bunch of writes so wait @@ -293,7 +293,7 @@ TranzportControlProtocol::monitor_work () } } // pending = 0; - } + } return (void*) 0; } diff --git a/libs/surfaces/tranzport/interface.cc b/libs/surfaces/tranzport/interface.cc index 3cf7090783..ac4341cde8 100644 --- a/libs/surfaces/tranzport/interface.cc +++ b/libs/surfaces/tranzport/interface.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ #include "control_protocol/control_protocol.h" diff --git a/libs/surfaces/tranzport/io.cc b/libs/surfaces/tranzport/io.cc index 14242ea0ec..39be2c2e51 100644 --- a/libs/surfaces/tranzport/io.cc +++ b/libs/surfaces/tranzport/io.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ /* The routines in here should know absolutely nothing about how io is actually done */ @@ -59,8 +59,8 @@ TranzportControlProtocol::lights_flush () std::bitset<LIGHTS> light_state; light_state = lights_pending ^ lights_current; if ( (light_state.none() || lights_invalid.none())) - { - return (0); + { + return (0); } #if DEBUG_TRANZPORT_LIGHTS @@ -73,7 +73,7 @@ TranzportControlProtocol::lights_flush () if ( _device_status == STATUS_OK || _device_status == STATUS_ONLINE) { for (i = 0; i<LIGHTS; i++) { - if(light_state[i]) { + if(light_state[i]) { if(light_set ((LightID)i,lights_pending[i])) { #if DEBUG_TRANZPORT_LIGHTS > 2 printf("Did %d light writes\n",i); diff --git a/libs/surfaces/tranzport/io_kernel.cc b/libs/surfaces/tranzport/io_kernel.cc index 5e29e9ac7b..0532ee7e6b 100644 --- a/libs/surfaces/tranzport/io_kernel.cc +++ b/libs/surfaces/tranzport/io_kernel.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ #if HAVE_TRANZPORT_KERNEL_DRIVER @@ -33,8 +33,8 @@ TranzportControlProtocol::probe () { if((udev = ::open(TRANZPORT_DEVICE,O_RDWR))> 0) { ::close(udev); - return true; - } + return true; + } error << _("Tranzport: Can't open device for Read/Write: ") << endmsg; return false; } @@ -44,7 +44,7 @@ TranzportControlProtocol::open () { if((udev=::open(TRANZPORT_DEVICE,O_RDWR))> 0) { return(udev); - } + } error << _("Tranzport: no device detected") << endmsg; return udev; } @@ -67,22 +67,22 @@ TranzportControlProtocol::close () // someday do buffered reads, presently this does blocking reads, which is bad... -int TranzportControlProtocol::read(uint8_t *buf, uint32_t timeout_override) +int TranzportControlProtocol::read(uint8_t *buf, uint32_t timeout_override) { last_read_error = ::read (udev, (char *) buf, 8); switch(errno) { case -ENOENT: case -ENXIO: case -ECONNRESET: - case -ESHUTDOWN: - case -ENODEV: + case -ESHUTDOWN: + case -ENODEV: cerr << "Tranzport disconnected, errno: " << last_read_error; set_active(false); break; case -ETIMEDOUT: // This is not normal, but lets see what happened cerr << "Tranzport read timed out, errno: " << last_read_error; break; - default: + default: #if DEBUG_TRANZPORT cerr << "Got an unknown error on read:" << last_read_error "\n"; #endif @@ -90,7 +90,7 @@ int TranzportControlProtocol::read(uint8_t *buf, uint32_t timeout_override) } return last_read_error; -} +} int @@ -109,15 +109,15 @@ TranzportControlProtocol::write_noretry (uint8_t* cmd, uint32_t timeout_override case -ENOENT: case -ENXIO: case -ECONNRESET: - case -ESHUTDOWN: - case -ENODEV: + case -ESHUTDOWN: + case -ENODEV: cerr << "Tranzport disconnected, errno: " << last_write_error; set_active(false); break; case -ETIMEDOUT: // This is not normal but cerr << "Tranzport disconnected, errno: " << last_write_error; break; - default: + default: #if DEBUG_TRANZPORT cerr << "Got an unknown error on read:" << last_write_error "\n"; #endif diff --git a/libs/surfaces/tranzport/io_midi.cc b/libs/surfaces/tranzport/io_midi.cc index 0fd10cfbf3..b484ef79d5 100644 --- a/libs/surfaces/tranzport/io_midi.cc +++ b/libs/surfaces/tranzport/io_midi.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ /* io_midi: Implements reading and writing tranzport events via the normal tranzport midi specification */ -/* One day +/* One day #include <tranzport_control_protocol.h> */ diff --git a/libs/surfaces/tranzport/io_usb.cc b/libs/surfaces/tranzport/io_usb.cc index c4a004a160..5d4e75f7d1 100644 --- a/libs/surfaces/tranzport/io_usb.cc +++ b/libs/surfaces/tranzport/io_usb.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ #include <iostream> @@ -40,7 +40,7 @@ using namespace PBD; #include <pbd/abstract_ui.cc> -// I note that these usb specific open, close, probe, read routines are basically +// I note that these usb specific open, close, probe, read routines are basically // pure boilerplate and could easily be abstracted elsewhere bool @@ -57,7 +57,7 @@ TranzportControlProtocol::probe () for(dev = bus->devices; dev; dev = dev->next) { if (dev->descriptor.idVendor == VENDORID && dev->descriptor.idProduct == PRODUCTID) { - return true; + return true; } } } @@ -97,7 +97,7 @@ TranzportControlProtocol::open_core (struct usb_device* dev) cerr << _("Tranzport: cannot open USB transport") << endmsg; return -1; } - + if (usb_claim_interface (udev, 0) < 0) { cerr << _("Tranzport: cannot claim USB interface") << endmsg; usb_close (udev); @@ -135,20 +135,20 @@ TranzportControlProtocol::close () return ret; } -int TranzportControlProtocol::read(uint8_t *buf, uint32_t timeout_override) +int TranzportControlProtocol::read(uint8_t *buf, uint32_t timeout_override) { last_read_error = usb_interrupt_read (udev, READ_ENDPOINT, (char *) buf, 8, timeout_override); switch(last_read_error) { case -ENOENT: case -ENXIO: case -ECONNRESET: - case -ESHUTDOWN: - case -ENODEV: + case -ESHUTDOWN: + case -ENODEV: cerr << "Tranzport disconnected, errno: " << last_read_error; set_active(false); case -ETIMEDOUT: // This is normal break; - default: + default: #if DEBUG_TRANZPORT cerr << "Got an unknown error on read:" << last_read_error "\n"; #endif @@ -156,7 +156,7 @@ int TranzportControlProtocol::read(uint8_t *buf, uint32_t timeout_override) } return last_read_error; -} +} int @@ -175,13 +175,13 @@ TranzportControlProtocol::write_noretry (uint8_t* cmd, uint32_t timeout_override case -ENOENT: case -ENXIO: case -ECONNRESET: - case -ESHUTDOWN: - case -ENODEV: + case -ESHUTDOWN: + case -ENODEV: cerr << "Tranzport disconnected, errno: " << last_write_error; set_active(false); case -ETIMEDOUT: // This is normal break; - default: + default: #if DEBUG_TRANZPORT cerr << "Got an unknown error on read:" << last_write_error "\n"; #endif diff --git a/libs/surfaces/tranzport/lcd.cc b/libs/surfaces/tranzport/lcd.cc index 88f9ea36d6..592bf7cf00 100644 --- a/libs/surfaces/tranzport/lcd.cc +++ b/libs/surfaces/tranzport/lcd.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ #include <tranzport_control_protocol.h> // doing these functions made me realize that screen_invalid should be lcd_isdamaged FIXME soon -bool TranzportControlProtocol::lcd_damage() +bool TranzportControlProtocol::lcd_damage() { screen_invalidate(); return true; @@ -41,7 +41,7 @@ bool TranzportControlProtocol::lcd_damage (int row, int col, int length) // Still working on the layering, arguably screen_invalid should be lcd_invalid // or vice versa -bool TranzportControlProtocol::lcd_isdamaged () +bool TranzportControlProtocol::lcd_isdamaged () { if(screen_invalid.any()) { #if DEBUG_TRANZPORT > 5 @@ -65,7 +65,7 @@ bool TranzportControlProtocol::lcd_isdamaged (int row, int col, int length) #endif return true; } - return false; + return false; } // lcd_clear would be a separate function for a smart display @@ -84,32 +84,32 @@ TranzportControlProtocol::lcd_clear () int TranzportControlProtocol::lcd_flush () { - return 0; + return 0; } -int +int TranzportControlProtocol::lcd_write(uint8_t* cmd, uint32_t timeout_override) { int result; #if (DEBUG_TRANZPORT_SCREEN > 0) - printf("VALID : %s\n", (screen_invalid.to_string()).c_str()); + printf("VALID : %s\n", (screen_invalid.to_string()).c_str()); #endif if ((result = write(cmd,timeout_override))) { #if DEBUG_TRANZPORT > 4 - printf("usb screen update failed for some reason... why? \nresult, cmd and data were %d %02x %02x %02x %02x %02x %02x %02x %02x\n", - result, cmd[0],cmd[1],cmd[2], cmd[3], cmd[4], cmd[5],cmd[6],cmd[7]); + printf("usb screen update failed for some reason... why? \nresult, cmd and data were %d %02x %02x %02x %02x %02x %02x %02x %02x\n", + result, cmd[0],cmd[1],cmd[2], cmd[3], cmd[4], cmd[5],cmd[6],cmd[7]); #endif } return result; } -void -TranzportControlProtocol::lcd_fill (uint8_t fill_char) +void +TranzportControlProtocol::lcd_fill (uint8_t fill_char) { } -void -TranzportControlProtocol::lcd_print (int row, int col, const char* text) +void +TranzportControlProtocol::lcd_print (int row, int col, const char* text) { print(row,col,text); } diff --git a/libs/surfaces/tranzport/lights.cc b/libs/surfaces/tranzport/lights.cc index c0e8092f45..89cf107ace 100644 --- a/libs/surfaces/tranzport/lights.cc +++ b/libs/surfaces/tranzport/lights.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ #include <tranzport_control_protocol.h> @@ -51,29 +51,29 @@ TranzportControlProtocol::light_off (LightID light) void TranzportControlProtocol::lights_init() { lights_invalid.set(); - lights_flash = lights_pending = lights_current.reset(); + lights_flash = lights_pending = lights_current.reset(); } -// Now that all this is bitsets, I don't see much +// Now that all this is bitsets, I don't see much // need for these 4 to remain in the API -void TranzportControlProtocol::light_validate (LightID light) +void TranzportControlProtocol::light_validate (LightID light) { lights_invalid.reset(light); } -void TranzportControlProtocol::light_invalidate (LightID light) +void TranzportControlProtocol::light_invalidate (LightID light) { lights_invalid.set(light); } -void TranzportControlProtocol::lights_validate () +void TranzportControlProtocol::lights_validate () { lights_invalid.reset(); } -void TranzportControlProtocol::lights_invalidate () +void TranzportControlProtocol::lights_invalidate () { lights_invalid.set(); } diff --git a/libs/surfaces/tranzport/meter.cc b/libs/surfaces/tranzport/meter.cc index cc57846058..5adc387a40 100644 --- a/libs/surfaces/tranzport/meter.cc +++ b/libs/surfaces/tranzport/meter.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ /* Generic support for character based metering on a track */ diff --git a/libs/surfaces/tranzport/mode.cc b/libs/surfaces/tranzport/mode.cc index 03d715e66f..cc45c785ca 100644 --- a/libs/surfaces/tranzport/mode.cc +++ b/libs/surfaces/tranzport/mode.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ #include <tranzport_control_protocol.h> @@ -50,7 +50,7 @@ TranzportControlProtocol::next_display_mode () enter_big_meter_mode(); break; - case DisplayConfig: + case DisplayConfig: case DisplayBling: case DisplayBlingMeter: enter_normal_display_mode(); diff --git a/libs/surfaces/tranzport/mode_loop.cc b/libs/surfaces/tranzport/mode_loop.cc index b9ea9f239e..527dd17c95 100644 --- a/libs/surfaces/tranzport/mode_loop.cc +++ b/libs/surfaces/tranzport/mode_loop.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ /* placeholder for Marker Mode: Edit Markers, Setup Loops, and Punch in points */ diff --git a/libs/surfaces/tranzport/mode_tuner.cc b/libs/surfaces/tranzport/mode_tuner.cc index a686f81be1..2d2a99adaf 100644 --- a/libs/surfaces/tranzport/mode_tuner.cc +++ b/libs/surfaces/tranzport/mode_tuner.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ /* Placeholder for a tuner mode at some point */ diff --git a/libs/surfaces/tranzport/panner.cc b/libs/surfaces/tranzport/panner.cc index 4a177db9a7..9fd064a3b1 100644 --- a/libs/surfaces/tranzport/panner.cc +++ b/libs/surfaces/tranzport/panner.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * */ #include <tranzport_common.h> diff --git a/libs/surfaces/tranzport/screen.cc b/libs/surfaces/tranzport/screen.cc index 74d6c7d528..aa88817300 100644 --- a/libs/surfaces/tranzport/screen.cc +++ b/libs/surfaces/tranzport/screen.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ #include <cstring> @@ -26,7 +26,7 @@ void TranzportControlProtocol::screen_clear () { const char *blank = " "; - print(0,0,blank); + print(0,0,blank); print(1,0,blank); } @@ -51,7 +51,7 @@ void TranzportControlProtocol::screen_init () screen_invalidate(); } -// FIXME: Switch to a column oriented flush to make the redraw of the +// FIXME: Switch to a column oriented flush to make the redraw of the // meters look better int @@ -72,20 +72,20 @@ TranzportControlProtocol::screen_flush () #endif if(cell > 4) { row = 1; } else { row = 0; } col_base = (cell*4)%COLUMNS; - - uint8_t cmd[8]; - cmd[0] = 0x00; - cmd[1] = 0x01; - cmd[2] = cell; - cmd[3] = screen_pending[row][col_base]; + + uint8_t cmd[8]; + cmd[0] = 0x00; + cmd[1] = 0x01; + cmd[2] = cell; + cmd[3] = screen_pending[row][col_base]; cmd[4] = screen_pending[row][col_base+1]; - cmd[5] = screen_pending[row][col_base+2]; + cmd[5] = screen_pending[row][col_base+2]; cmd[6] = screen_pending[row][col_base+3]; cmd[7] = 0x00; if((pending = lcd_write(cmd)) == 0) { /* successful write: copy to current cached display */ - screen_invalid &= mask.flip(); + screen_invalid &= mask.flip(); memcpy (&screen_current[row][col_base], &screen_pending[row][col_base], 4); } } diff --git a/libs/surfaces/tranzport/show.cc b/libs/surfaces/tranzport/show.cc index 46047f30c5..6d97abf43a 100644 --- a/libs/surfaces/tranzport/show.cc +++ b/libs/surfaces/tranzport/show.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ #include <iostream> @@ -70,7 +70,7 @@ log_meter (float db) def = (db + 20.0f) * 2.5f + 50.0f; } - /* 115 is the deflection %age that would be + /* 115 is the deflection %age that would be when db=6.0. this is an arbitrary endpoint for our scaling. */ @@ -79,43 +79,43 @@ log_meter (float db) } #define TRANZ_U 0x1 /* upper */ -#define TRANZ_BL 0x2 /* lower left */ +#define TRANZ_BL 0x2 /* lower left */ #define TRANZ_Q2 0x3 /* 2 quadrant block */ -#define TRANZ_ULB 0x4 /* Upper + lower left */ -#define TRANZ_L 0x5 /* lower */ -#define TRANZ_UBL 0x6 /* upper left + bottom all */ -#define TRANZ_Q4 0x7 /* 4 quadrant block */ +#define TRANZ_ULB 0x4 /* Upper + lower left */ +#define TRANZ_L 0x5 /* lower */ +#define TRANZ_UBL 0x6 /* upper left + bottom all */ +#define TRANZ_Q4 0x7 /* 4 quadrant block */ #define TRANZ_UL 0x08 /* upper left */ // Shift Space - switches your "view" // Currently defined views are: // BigMeter -// +// // Shift Record - SAVE SNAPSHOT // Somewhere I was rewriting this // Other meters // Inverted - show meters "inside out" For example 4 meters covering 2 cells each, and the -// +// // each 4 character cell could be an 8 bar meter = 10 meters! // Dual Meter mode - master and current track // We have 16 rows of pixels so we COULD do a vertical meter -// BEAT BLOCKS - For each beat, flash a 8 block (could use the center for vertical meters) +// BEAT BLOCKS - For each beat, flash a 8 block (could use the center for vertical meters) // Could have something generic that could handle up to /20 time // Odd times could flash the whole top bar for the first beat -// Vertical Meter _ .colon - + ucolon A P R I H FULLBLACK +// Vertical Meter _ .colon - + ucolon A P R I H FULLBLACK // MV@$%&*()- // 3 char block rotating beat `\'/ // 1 char rotating beat {/\} // 4 char in block rotating beat {/\} // {\/) - + void TranzportControlProtocol::show_mini_meter() { // FIXME - show the current marker in passing - const int meter_buf_size = 41; + const int meter_buf_size = 41; static uint32_t last_meter_fill_l = 0; static uint32_t last_meter_fill_r = 0; uint32_t meter_size; @@ -123,25 +123,25 @@ void TranzportControlProtocol::show_mini_meter() float speed = fabsf(session->transport_speed()); char buf[meter_buf_size]; - if (speed == 1.0) { - meter_size = 32; + if (speed == 1.0) { + meter_size = 32; } - - if (speed == 0.0) { + + if (speed == 0.0) { meter_size = 20; // not actually reached } - - if (speed > 0.0 && (speed < 1.0)) { + + if (speed > 0.0 && (speed < 1.0)) { meter_size = 20; // may shrink more one day } - if (speed > 1.0 && (speed < 2.0)) { + if (speed > 1.0 && (speed < 2.0)) { meter_size = 20; } - + if (speed >= 2.0) { - meter_size = 24; - } + meter_size = 24; + } // you only seem to get a route_table[0] == 0 on moving forward - bug in next_track? @@ -180,19 +180,19 @@ void TranzportControlProtocol::show_mini_meter() light_on (LightTrackrec); } - const uint8_t char_map[16] = { ' ', TRANZ_UL, + const uint8_t char_map[16] = { ' ', TRANZ_UL, TRANZ_U, TRANZ_U, - TRANZ_BL, TRANZ_Q2, + TRANZ_BL, TRANZ_Q2, TRANZ_Q2, TRANZ_ULB, - TRANZ_L, TRANZ_UBL, + TRANZ_L, TRANZ_UBL, ' ',' ', TRANZ_L, TRANZ_UBL, TRANZ_Q4,TRANZ_Q4 - }; + }; unsigned int val,j,i; for(j = 1, i = 0; i < meter_size/2; i++, j+=2) { - val = (fill_left >= j) | ((fill_left >= j+1) << 1) | + val = (fill_left >= j) | ((fill_left >= j+1) << 1) | ((fill_right >=j) << 2) | ((fill_right >= j+1) << 3); buf[i] = char_map[val]; } @@ -207,7 +207,7 @@ void TranzportControlProtocol::show_mini_meter() // char peak[2]; peak[0] = ' '; peak[1] = '\0'; // if(fraction_l == 1.0 || fraction_r == 1.0) peak[0] = 'P'; - // print (1,8,peak); // Put a peak meter - P in if we peaked. + // print (1,8,peak); // Put a peak meter - P in if we peaked. } @@ -218,7 +218,7 @@ TranzportControlProtocol::show_meter () if (route_table[0] == 0) { // Principle of least surprise print (0, 0, "No audio to meter!!!"); - print (1, 0, "Select another track"); + print (1, 0, "Select another track"); return; } @@ -260,7 +260,7 @@ TranzportControlProtocol::show_meter () for (i = 0; i < fill; ++i) { buf[i] = 0x07; /* tranzport special code for 4 quadrant LCD block */ - } + } /* add a possible half-step */ @@ -285,7 +285,7 @@ TranzportControlProtocol::show_meter () void TranzportControlProtocol::show_bbt (framepos_t where) -{ +{ if (where != last_where) { char buf[16]; Timecode::BBT_Time bbt; @@ -303,33 +303,33 @@ TranzportControlProtocol::show_bbt (framepos_t where) float speed = fabsf(session->transport_speed()); - if (speed == 1.0) { + if (speed == 1.0) { sprintf (buf, "%03" PRIu32 "%1" PRIu32, bbt.bars,bbt.beats); // switch to hex one day - print (1, 16, buf); + print (1, 16, buf); } - if (speed == 0.0) { + if (speed == 0.0) { sprintf (buf, "%03" PRIu32 "|%1" PRIu32 "|%04" PRIu32, bbt.bars,bbt.beats,bbt.ticks); - print (1, 10, buf); + print (1, 10, buf); } - if (speed > 0.0 && (speed < 1.0)) { + if (speed > 0.0 && (speed < 1.0)) { sprintf (buf, "%03" PRIu32 "|%1" PRIu32 "|%04" PRIu32, bbt.bars,bbt.beats,bbt.ticks); - print (1, 10, buf); + print (1, 10, buf); } - if (speed > 1.0 && (speed < 2.0)) { + if (speed > 1.0 && (speed < 2.0)) { sprintf (buf, "%03" PRIu32 "|%1" PRIu32 "|%04" PRIu32, bbt.bars,bbt.beats,bbt.ticks); - print (1, 10, buf); + print (1, 10, buf); } if (speed >= 2.0) { - sprintf (buf, "%03" PRIu32 "|%1" PRIu32 "|%02" PRIu32, bbt.bars,bbt.beats,bbt.ticks); - print (1, 12, buf); - } + sprintf (buf, "%03" PRIu32 "|%1" PRIu32 "|%02" PRIu32, bbt.bars,bbt.beats,bbt.ticks); + print (1, 12, buf); + } TempoMap::Metric m (session->tempo_map().metric_at (where)); - + // the lights stop working well at above 100 bpm so don't bother if(m.tempo().beats_per_minute() < 101.0 && (speed > 0.0)) { @@ -375,7 +375,7 @@ TranzportControlProtocol::show_timecode (framepos_t where) print (1, 15, buf); sprintf (buf, "%02" PRIu32, timecode.frames); - print_noretry (1, 18, buf); + print_noretry (1, 18, buf); last_where = where; } @@ -388,12 +388,12 @@ TranzportControlProtocol::show_track_gain () if (route_table[0]) { gain_t g = route_get_gain (0); if ((g != last_track_gain) || lcd_isdamaged(0,12,8)) { - char buf[16]; + char buf[16]; snprintf (buf, sizeof (buf), "%6.1fdB", coefficient_to_dB (route_get_effective_gain (0))); - print (0, 12, buf); + print (0, 12, buf); last_track_gain = g; } } else { - print (0, 9, " "); + print (0, 9, " "); } } diff --git a/libs/surfaces/tranzport/slider_gain.h b/libs/surfaces/tranzport/slider_gain.h index 1bb497178f..c85930001d 100644 --- a/libs/surfaces/tranzport/slider_gain.h +++ b/libs/surfaces/tranzport/slider_gain.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ #ifndef ardour_slider_gain #define ardour_slider_gain -static inline double +static inline double gain_to_slider_position (ARDOUR::gain_t g) { if (g == 0) return 0; @@ -29,7 +29,7 @@ gain_to_slider_position (ARDOUR::gain_t g) } -static inline ARDOUR::gain_t +static inline ARDOUR::gain_t slider_position_to_gain (double pos) { /* XXX Marcus writes: this doesn't seem right to me. but i don't have a better answer ... */ diff --git a/libs/surfaces/tranzport/state.cc b/libs/surfaces/tranzport/state.cc index 119e7953d2..f5718174be 100644 --- a/libs/surfaces/tranzport/state.cc +++ b/libs/surfaces/tranzport/state.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * */ #include <iostream> @@ -48,7 +48,7 @@ using namespace PBD; // FIXME: How to handle multiple tranzports in a system? XMLNode& -TranzportControlProtocol::get_state () +TranzportControlProtocol::get_state () { return ControlProtocol::get_state(); } @@ -108,7 +108,7 @@ TranzportControlProtocol::set_state (const XMLNode& node) return -1; } } -#endif +#endif return retval; @@ -118,28 +118,28 @@ TranzportControlProtocol::set_state (const XMLNode& node) // And perhaps we could load up sessions this way, too int -TranzportControlProtocol::save (char *name) +TranzportControlProtocol::save (char *name) { // Presently unimplemented return 0; } int -TranzportControlProtocol::load (char *name) +TranzportControlProtocol::load (char *name) { // Presently unimplemented return 0; } int -TranzportControlProtocol::save_config (char *name) +TranzportControlProtocol::save_config (char *name) { // Presently unimplemented return 0; } int -TranzportControlProtocol::load_config (char *name) +TranzportControlProtocol::load_config (char *name) { // Presently unimplemented return 0; diff --git a/libs/surfaces/tranzport/tranzport_base.h b/libs/surfaces/tranzport/tranzport_base.h index ef77748c50..84a5b680a8 100644 --- a/libs/surfaces/tranzport/tranzport_base.h +++ b/libs/surfaces/tranzport/tranzport_base.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,26 +15,26 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ /* This header file is basically where all the tranzport debuggable options go. Try to only check it in with minimal debugging enabled so production systems don't have to fiddle with it. */ -/* Design notes: The tranzport is a unique device, basically a - 20x2 character lcd gui with (almost) 22 shift keys and 8 blinking lights. +/* Design notes: The tranzport is a unique device, basically a + 20x2 character lcd gui with (almost) 22 shift keys and 8 blinking lights. As such it has several unique constraints. In the libusb driver, the device exerts flow control by having a usb write fail. It is pointless to retry madly at that point, - the device is busy, and it's not going to become unbusy very quickly. + the device is busy, and it's not going to become unbusy very quickly. - So writes need to be either "mandatory" or "unreliable", and therein + So writes need to be either "mandatory" or "unreliable", and therein lies the rub, as the kernel can also drop writes, and missing an - interrupt in userspace is also generally bad. + interrupt in userspace is also generally bad. - However, the kernel driver retries writes for you and also buffers and + However, the kernel driver retries writes for you and also buffers and compresses incoming wheel events - it will rarely, if ever, drop data. A more complex surface might have hundreds of lights and several displays. @@ -61,7 +61,7 @@ // for now, this is what the device is called #define TRANZPORT_DEVICE "/dev/tranzport0" -#if DEBUG_TRANZPORT > 0 +#if DEBUG_TRANZPORT > 0 #define DEBUG_TRANZPORT_SCREEN 10 #define DEBUG_TRANZPORT_BITS 10 #define DEBUG_TRANZPORT_LIGHTS 10 diff --git a/libs/surfaces/tranzport/tranzport_common.h b/libs/surfaces/tranzport/tranzport_common.h index b3a2da513a..a0fe13d02b 100644 --- a/libs/surfaces/tranzport/tranzport_common.h +++ b/libs/surfaces/tranzport/tranzport_common.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ /* The most common header files that the tranzport uses */ #ifndef ardour_tranzport_common -#define ardour_tranzport_common +#define ardour_tranzport_common #include <iostream> -#include <algorithm> -#include <cmath> - +#include <algorithm> +#include <cmath> + #define __STDC_FORMAT_MACROS #include <inttypes.h> #include <float.h> diff --git a/libs/surfaces/tranzport/tranzport_control_protocol.h b/libs/surfaces/tranzport/tranzport_control_protocol.h index 1c318007b0..aa60d5399f 100644 --- a/libs/surfaces/tranzport/tranzport_control_protocol.h +++ b/libs/surfaces/tranzport/tranzport_control_protocol.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2006 Paul Davis + Copyright (C) 2006 Paul Davis Copyright (C) 2007 Mike Taht This program is free software; you can redistribute it and/or modify @@ -59,7 +59,7 @@ private: const static int STATUS_OFFLINE = 0xff; const static int STATUS_ONLINE = 0x01; const static int STATUS_OK = 0x00; - + const static int LIGHTS = 7; const static int ROWS = 2; const static int COLUMNS = 20; @@ -97,7 +97,7 @@ private: ButtonPlay = 0x00100000, ButtonRecord = 0x00000100, ButtonShift = 0x08000000, - ButtonFootswitch = 0x00001000 + ButtonFootswitch = 0x00001000 }; enum WheelShiftMode { @@ -124,7 +124,7 @@ private: WheelIncrSecond, WheelIncrMinute }; - + enum DisplayMode { DisplayNormal, DisplayRecording, @@ -183,7 +183,7 @@ private: std::bitset<LIGHTS> lights_flash; int32_t last_notify; - char last_notify_msg[COLUMNS+1]; + char last_notify_msg[COLUMNS+1]; uint32_t last_bars; uint32_t last_beats; uint32_t last_ticks; @@ -241,10 +241,10 @@ private: void screen_invalidate(); int screen_flush(); void screen_clear(); - // bool screen_isuptodate(); // think on this - + // bool screen_isuptodate(); // think on this - int screen_show_bling(); - // Commands to write to the lcd + // Commands to write to the lcd int lcd_init(); bool lcd_damage(); @@ -293,7 +293,7 @@ private: void enter_bling_mode(); void next_marker (); // basicui doesn't give me enough info - void prev_marker (); + void prev_marker (); void next_display_mode (); void normal_update (); diff --git a/libs/surfaces/tranzport/view_automation.cc b/libs/surfaces/tranzport/view_automation.cc index 4c0b18acf0..ad9befd9b9 100644 --- a/libs/surfaces/tranzport/view_automation.cc +++ b/libs/surfaces/tranzport/view_automation.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ diff --git a/libs/surfaces/tranzport/view_bigmeter.cc b/libs/surfaces/tranzport/view_bigmeter.cc index 4c0b18acf0..ad9befd9b9 100644 --- a/libs/surfaces/tranzport/view_bigmeter.cc +++ b/libs/surfaces/tranzport/view_bigmeter.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ diff --git a/libs/surfaces/tranzport/view_bling.cc b/libs/surfaces/tranzport/view_bling.cc index 4c0b18acf0..ad9befd9b9 100644 --- a/libs/surfaces/tranzport/view_bling.cc +++ b/libs/surfaces/tranzport/view_bling.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ diff --git a/libs/surfaces/tranzport/view_bus.cc b/libs/surfaces/tranzport/view_bus.cc index 4c0b18acf0..ad9befd9b9 100644 --- a/libs/surfaces/tranzport/view_bus.cc +++ b/libs/surfaces/tranzport/view_bus.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ diff --git a/libs/surfaces/tranzport/view_config.cc b/libs/surfaces/tranzport/view_config.cc index 4c0b18acf0..ad9befd9b9 100644 --- a/libs/surfaces/tranzport/view_config.cc +++ b/libs/surfaces/tranzport/view_config.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ diff --git a/libs/surfaces/tranzport/view_layer.cc b/libs/surfaces/tranzport/view_layer.cc index 8de9e3ad14..a350c08687 100644 --- a/libs/surfaces/tranzport/view_layer.cc +++ b/libs/surfaces/tranzport/view_layer.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ /* ultimately this view will let you: rotate layers (takes) on the currently selected track/region, do cross fades, and the like */ diff --git a/libs/surfaces/tranzport/view_loop.cc b/libs/surfaces/tranzport/view_loop.cc index 4c0b18acf0..ad9befd9b9 100644 --- a/libs/surfaces/tranzport/view_loop.cc +++ b/libs/surfaces/tranzport/view_loop.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ diff --git a/libs/surfaces/tranzport/view_manymeter.cc b/libs/surfaces/tranzport/view_manymeter.cc index 4c0b18acf0..ad9befd9b9 100644 --- a/libs/surfaces/tranzport/view_manymeter.cc +++ b/libs/surfaces/tranzport/view_manymeter.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ diff --git a/libs/surfaces/tranzport/view_marker.cc b/libs/surfaces/tranzport/view_marker.cc index 4c0b18acf0..ad9befd9b9 100644 --- a/libs/surfaces/tranzport/view_marker.cc +++ b/libs/surfaces/tranzport/view_marker.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ diff --git a/libs/surfaces/tranzport/view_master.cc b/libs/surfaces/tranzport/view_master.cc index 4c0b18acf0..ad9befd9b9 100644 --- a/libs/surfaces/tranzport/view_master.cc +++ b/libs/surfaces/tranzport/view_master.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ diff --git a/libs/surfaces/tranzport/view_plugins.cc b/libs/surfaces/tranzport/view_plugins.cc index 4c0b18acf0..ad9befd9b9 100644 --- a/libs/surfaces/tranzport/view_plugins.cc +++ b/libs/surfaces/tranzport/view_plugins.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ diff --git a/libs/surfaces/tranzport/view_std.cc b/libs/surfaces/tranzport/view_std.cc index 4c0b18acf0..ad9befd9b9 100644 --- a/libs/surfaces/tranzport/view_std.cc +++ b/libs/surfaces/tranzport/view_std.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ diff --git a/libs/surfaces/tranzport/view_tempo.cc b/libs/surfaces/tranzport/view_tempo.cc index 4c0b18acf0..ad9befd9b9 100644 --- a/libs/surfaces/tranzport/view_tempo.cc +++ b/libs/surfaces/tranzport/view_tempo.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ diff --git a/libs/surfaces/tranzport/view_tuner.cc b/libs/surfaces/tranzport/view_tuner.cc index 4c0b18acf0..ad9befd9b9 100644 --- a/libs/surfaces/tranzport/view_tuner.cc +++ b/libs/surfaces/tranzport/view_tuner.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ diff --git a/libs/surfaces/tranzport/wheel.cc b/libs/surfaces/tranzport/wheel.cc index 3f15e060a2..8122b8a77d 100644 --- a/libs/surfaces/tranzport/wheel.cc +++ b/libs/surfaces/tranzport/wheel.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * * */ #include <iostream> diff --git a/libs/surfaces/tranzport/wheel_modes.cc b/libs/surfaces/tranzport/wheel_modes.cc index a7861fc5ed..565a68de20 100644 --- a/libs/surfaces/tranzport/wheel_modes.cc +++ b/libs/surfaces/tranzport/wheel_modes.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Paul Davis + * Copyright (C) 2006 Paul Davis * Copyright (C) 2007 Michael Taht * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * */ #include <iostream> @@ -100,7 +100,7 @@ TranzportControlProtocol::show_wheel_mode () // if ? greater. dont if(session->transport_speed() != 0) { - show_mini_meter(); + show_mini_meter(); } else { switch (wheel_mode) { @@ -134,5 +134,5 @@ TranzportControlProtocol::show_wheel_mode () } print (1, 0, text.c_str()); - } + } } |