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

NO-OP: whitespace

Browse source 
This fixes mostly <tab> after <space> and similar <tab> not used
for indenting as well as some related code alignment issues.
This commit is contained in:
Robin Gareus 2019-04-13 17:48:27 +02:00
parent 90a7bef656
commit 31815b5f26
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
33 changed files with 268 additions and 287 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gtk2_ardour/export_channel_selector.cc
View file

@ -86,9 +86,6 @@ PortExportChannelSelector::PortExportChannelSelector (ARDOUR::Session * session,
PortExportChannelSelector::~PortExportChannelSelector () PortExportChannelSelector::~PortExportChannelSelector ()
{ {
// if (session) {
// session->add_instant_xml (get_state(), false);
// }
} }
void void

8
gtk2_ardour/export_timespan_selector.cc
View file

@ -246,17 +246,9 @@ ExportTimespanSelector::construct_label (ARDOUR::Location const * location) cons
break; break;
} }
// label += _("from ");
// label += "<span color=\"#7fff7f\">";
label += start; label += start;
// label += "</span>";
label += _(" to "); label += _(" to ");
// label += "<span color=\"#7fff7f\">";
label += end; label += end;
// label += "</span>";
return label; return label;
} }

3
gtk2_ardour/generic_pluginui.cc
View file

@ -305,8 +305,9 @@ std::size_t s1pos, s2pos, n = 0;
s1pos = s1.length(); s1pos = s1.length();
s2pos = s2.length(); s2pos = s2.length();
while (s1pos-- > 0 && s2pos-- > 0) { while (s1pos-- > 0 && s2pos-- > 0) {
if (!match_or_digit(s1[s1pos], s2[s2pos]) ) if (!match_or_digit(s1[s1pos], s2[s2pos])) {
break; break;
}
n++; n++;
} }
return n; return n;

7
gtk2_ardour/ghostregion.cc
View file

@ -44,7 +44,7 @@ using namespace Editing;
using namespace ARDOUR; using namespace ARDOUR;
using ArdourCanvas::Duple; using ArdourCanvas::Duple;
GhostRegion::GhostRegion(RegionView& rv, GhostRegion::GhostRegion (RegionView& rv,
ArdourCanvas::Container* parent, ArdourCanvas::Container* parent,
TimeAxisView& tv, TimeAxisView& tv,
TimeAxisView& source_tv, TimeAxisView& source_tv,
@ -116,7 +116,7 @@ GhostRegion::is_automation_ghost()
return (dynamic_cast<AutomationTimeAxisView*>(&trackview)) != 0; return (dynamic_cast<AutomationTimeAxisView*>(&trackview)) != 0;
} }
AudioGhostRegion::AudioGhostRegion(RegionView& rv, AudioGhostRegion::AudioGhostRegion (RegionView& rv,
TimeAxisView& tv, TimeAxisView& tv,
TimeAxisView& source_tv, TimeAxisView& source_tv,
double initial_unit_pos) double initial_unit_pos)
@ -200,7 +200,7 @@ MidiGhostRegion::MidiGhostRegion(MidiRegionView& rv,
MidiStreamView& msv, MidiStreamView& msv,
TimeAxisView& source_tv, TimeAxisView& source_tv,
double initial_unit_pos) double initial_unit_pos)
: GhostRegion(rv, : GhostRegion (rv,
msv.midi_underlay_group, msv.midi_underlay_group,
msv.trackview(), msv.trackview(),
source_tv, source_tv,
@ -465,7 +465,6 @@ MidiGhostRegion::redisplay_model ()
* representation of it. * representation of it.
* @return Our Event, or 0 if not found. * @return Our Event, or 0 if not found.
*/ */
MidiGhostRegion::GhostEvent * MidiGhostRegion::GhostEvent *
MidiGhostRegion::find_event (boost::shared_ptr<NoteType> parent) MidiGhostRegion::find_event (boost::shared_ptr<NoteType> parent)
{ {

11
gtk2_ardour/gtk_pianokeyboard.h
View file

@ -35,10 +35,10 @@ G_BEGIN_DECLS
typedef struct _PianoKeyboard PianoKeyboard; typedef struct _PianoKeyboard PianoKeyboard;
typedef struct _PianoKeyboardClass PianoKeyboardClass; typedef struct _PianoKeyboardClass PianoKeyboardClass;
#define NNOTES 127 #define NNOTES (127)
#define OCTAVE_MIN -1 #define OCTAVE_MIN (-1)
#define OCTAVE_MAX 7 #define OCTAVE_MAX (7)
struct PKNote { struct PKNote {
int pressed; /* 1 if key is in pressed down state. */ int pressed; /* 1 if key is in pressed down state. */
@ -63,7 +63,7 @@ struct _PianoKeyboard
gboolean monophonic; gboolean monophonic;
struct PKNote notes[NNOTES]; struct PKNote notes[NNOTES];
/* Table used to translate from PC keyboard character to MIDI note number. */ /* Table used to translate from PC keyboard character to MIDI note number. */
GHashTable *key_bindings; GHashTable* key_bindings;
}; };
struct _PianoKeyboardClass struct _PianoKeyboardClass
@ -73,6 +73,7 @@ struct _PianoKeyboardClass
GType piano_keyboard_get_type (void) G_GNUC_CONST; GType piano_keyboard_get_type (void) G_GNUC_CONST;
GtkWidget* piano_keyboard_new (void); GtkWidget* piano_keyboard_new (void);
void piano_keyboard_sustain_press (PianoKeyboard *pk); void piano_keyboard_sustain_press (PianoKeyboard *pk);
void piano_keyboard_sustain_release (PianoKeyboard *pk); void piano_keyboard_sustain_release (PianoKeyboard *pk);
void piano_keyboard_set_note_on (PianoKeyboard *pk, int note); void piano_keyboard_set_note_on (PianoKeyboard *pk, int note);
@ -80,9 +81,9 @@ void piano_keyboard_set_note_off (PianoKeyboard *pk, int note);
void piano_keyboard_set_keyboard_cue (PianoKeyboard *pk, int enabled); void piano_keyboard_set_keyboard_cue (PianoKeyboard *pk, int enabled);
void piano_keyboard_set_monophonic (PianoKeyboard *pk, gboolean monophonic); void piano_keyboard_set_monophonic (PianoKeyboard *pk, gboolean monophonic);
void piano_keyboard_set_octave (PianoKeyboard *pk, int octave); void piano_keyboard_set_octave (PianoKeyboard *pk, int octave);
gboolean piano_keyboard_set_keyboard_layout (PianoKeyboard *pk, const char *layout); gboolean piano_keyboard_set_keyboard_layout (PianoKeyboard *pk, const char *layout);
G_END_DECLS G_END_DECLS
#endif /* __PIANO_KEYBOARD_H__ */ #endif /* __PIANO_KEYBOARD_H__ */

135
gtk2_ardour/linux_vst_gui_support.cc
View file

@ -71,7 +71,7 @@ static pthread_t LXVST_gui_event_thread;
static bool LXVST_xerror; static bool LXVST_xerror;
int TempErrorHandler(Display *display, XErrorEvent *e) int TempErrorHandler (Display *display, XErrorEvent *e)
{ {
LXVST_xerror = true; LXVST_xerror = true;
@ -80,7 +80,7 @@ int TempErrorHandler(Display *display, XErrorEvent *e)
#ifdef LXVST_32BIT #ifdef LXVST_32BIT
int getXWindowProperty(Window window, Atom atom) int getXWindowProperty (Window window, Atom atom)
{ {
int result = 0; int result = 0;
int userSize; int userSize;
@ -95,25 +95,26 @@ int getXWindowProperty(Window window, Atom atom)
qutting the entire application because of e.g. an invalid qutting the entire application because of e.g. an invalid
window ID*/ window ID*/
XErrorHandler olderrorhandler = XSetErrorHandler(TempErrorHandler); XErrorHandler olderrorhandler = XSetErrorHandler (TempErrorHandler);
XGetWindowProperty( LXVST_XDisplay, //The display XGetWindowProperty (LXVST_XDisplay, // The display
window, //The Window window, // The Window
atom, //The property atom, // The property
0, //Offset into the data 0, // Offset into the data
1, //Number of 32Bit chunks of data 1, // Number of 32Bit chunks of data
false, //false = don't delete the property false, // false = don't delete the property
AnyPropertyType, //Required property type mask AnyPropertyType, // Required property type mask
&userType, //Actual type returned &userType, // Actual type returned
&userSize, //Actual format returned &userSize, // Actual format returned
&userCount, //Actual number of items stored in the returned data &userCount, // Actual number of items stored in the returned data
&bytes, //Number of bytes remaining if a partial read &bytes, // Number of bytes remaining if a partial read
&data); //The actual data read &data); // The actual data read
if(LXVST_xerror == false && userCount == 1) if (LXVST_xerror == false && userCount == 1) {
result = *(int*)data; result = *(int*)data;
}
XSetErrorHandler(olderrorhandler); XSetErrorHandler (olderrorhandler);
/*Hopefully this will return zero if the property is not set*/ /*Hopefully this will return zero if the property is not set*/
@ -129,7 +130,7 @@ int getXWindowProperty(Window window, Atom atom)
/* system of passing an eventProc address */ /* system of passing an eventProc address */
/********************************************************************/ /********************************************************************/
long getXWindowProperty(Window window, Atom atom) long getXWindowProperty (Window window, Atom atom)
{ {
long result = 0; long result = 0;
int userSize; int userSize;
@ -140,13 +141,14 @@ long getXWindowProperty(Window window, Atom atom)
LXVST_xerror = false; LXVST_xerror = false;
/*Use our own Xerror handler while we're in here - in an /*Use our own Xerror handler while we're in here - in an
attempt to stop the brain dead default Xerror behaviour of * attempt to stop the brain dead default Xerror behaviour of
qutting the entire application because of e.g. an invalid * qutting the entire application because of e.g. an invalid
window ID*/ * window ID
*/
XErrorHandler olderrorhandler = XSetErrorHandler(TempErrorHandler); XErrorHandler olderrorhandler = XSetErrorHandler (TempErrorHandler);
XGetWindowProperty( LXVST_XDisplay, XGetWindowProperty (LXVST_XDisplay,
window, window,
atom, atom,
0, 0,
@ -159,10 +161,11 @@ long getXWindowProperty(Window window, Atom atom)
&bytes, &bytes,
&data); &data);
if(LXVST_xerror == false && userCount == 1) if (LXVST_xerror == false && userCount == 1) {
result = *(long*)data; result = *(long*)data;
}
XSetErrorHandler(olderrorhandler); XSetErrorHandler (olderrorhandler);
/*Hopefully this will return zero if the property is not set*/ /*Hopefully this will return zero if the property is not set*/
@ -179,7 +182,7 @@ dispatch_x_events (XEvent* event, VSTState* vstfx)
{ {
/*Handle some of the Events we might be interested in*/ /*Handle some of the Events we might be interested in*/
switch(event->type) switch (event->type)
{ {
/*Configure event - when the window is resized or first drawn*/ /*Configure event - when the window is resized or first drawn*/
@ -199,7 +202,7 @@ dispatch_x_events (XEvent* event, VSTState* vstfx)
if (window == (Window) (vstfx->linux_window)) { if (window == (Window) (vstfx->linux_window)) {
#ifndef NDEBUG #ifndef NDEBUG
printf("dispatch_x_events: ConfigureNotify cfg:(%d %d) plugin:(%d %d)\n", printf ("dispatch_x_events: ConfigureNotify cfg: (%d %d) plugin: (%d %d)\n",
width, height, width, height,
vstfx->width, vstfx->height vstfx->width, vstfx->height
); );
@ -246,7 +249,7 @@ dispatch_x_events (XEvent* event, VSTState* vstfx)
vstfx->linux_plugin_ui_window = PluginUIWindowID; vstfx->linux_plugin_ui_window = PluginUIWindowID;
#ifdef LXVST_32BIT #ifdef LXVST_32BIT
int result = getXWindowProperty(PluginUIWindowID, XInternAtom(LXVST_XDisplay, "_XEventProc", false)); int result = getXWindowProperty (PluginUIWindowID, XInternAtom (LXVST_XDisplay, "_XEventProc", false));
if (result == 0) { if (result == 0) {
vstfx->eventProc = NULL; vstfx->eventProc = NULL;
@ -255,12 +258,13 @@ dispatch_x_events (XEvent* event, VSTState* vstfx)
} }
#endif #endif
#ifdef LXVST_64BIT #ifdef LXVST_64BIT
long result = getXWindowProperty(PluginUIWindowID, XInternAtom(LXVST_XDisplay, "_XEventProc", false)); long result = getXWindowProperty (PluginUIWindowID, XInternAtom (LXVST_XDisplay, "_XEventProc", false));
if(result == 0) if (result == 0) {
vstfx->eventProc = NULL; vstfx->eventProc = NULL;
else } else {
vstfx->eventProc = (void (*) (void* event))result; vstfx->eventProc = (void (*) (void* event))result;
}
#endif #endif
} }
break; break;
@ -276,15 +280,15 @@ dispatch_x_events (XEvent* event, VSTState* vstfx)
to effEditOpen when the editor is launched*/ to effEditOpen when the editor is launched*/
if (window == (Window) (vstfx->linux_window)) { if (window == (Window) (vstfx->linux_window)) {
char* message = XGetAtomName(LXVST_XDisplay, message_type); char* message = XGetAtomName (LXVST_XDisplay, message_type);
if (strcmp(message,"LaunchEditor") == 0) { if (strcmp (message,"LaunchEditor") == 0) {
if (event->xclient.data.l[0] == 0x0FEEDBAC) { if (event->xclient.data.l[0] == 0x0FEEDBAC) {
vstfx_launch_editor (vstfx); vstfx_launch_editor (vstfx);
} }
} }
XFree(message); XFree (message);
} }
break; break;
} }
@ -306,7 +310,7 @@ dispatch_x_events (XEvent* event, VSTState* vstfx)
return; return;
} }
vstfx->eventProc((void*)event); vstfx->eventProc ((void*)event);
} }
/** This is the main gui event loop for the plugin, we also need to pass /** This is the main gui event loop for the plugin, we also need to pass
@ -333,11 +337,10 @@ void* gui_event_loop (void* ptr)
bool may_sleep = true; bool may_sleep = true;
if(LXVST_XDisplay) if (LXVST_XDisplay) {
{
/*See if there are any events in the queue*/ /*See if there are any events in the queue*/
int num_events = XPending(LXVST_XDisplay); int num_events = XPending (LXVST_XDisplay);
if (num_events > 0) { if (num_events > 0) {
// keep dispatching events as fast as possible // keep dispatching events as fast as possible
@ -346,19 +349,17 @@ void* gui_event_loop (void* ptr)
/*process them if there are any*/ /*process them if there are any*/
while(num_events) while (num_events) {
{ XNextEvent (LXVST_XDisplay, &event);
XNextEvent(LXVST_XDisplay, &event);
/*Call dispatch events, with the event, for each plugin in the linked list*/ /*Call dispatch events, with the event, for each plugin in the linked list*/
for (vstfx = vstfx_first; vstfx; vstfx = vstfx->next) for (vstfx = vstfx_first; vstfx; vstfx = vstfx->next) {
{ pthread_mutex_lock (&vstfx->lock);
pthread_mutex_lock(&vstfx->lock);
dispatch_x_events(&event, vstfx); dispatch_x_events (&event, vstfx);
pthread_mutex_unlock(&vstfx->lock); pthread_mutex_unlock (&vstfx->lock);
} }
num_events--; num_events--;
@ -367,16 +368,15 @@ void* gui_event_loop (void* ptr)
/*We don't want to use all the CPU.. */ /*We don't want to use all the CPU.. */
Glib::usleep(1000); Glib::usleep (1000);
/*See if its time for us to do a scheduled event pass on all the plugins*/ /*See if its time for us to do a scheduled event pass on all the plugins*/
clock2 = g_get_monotonic_time(); clock2 = g_get_monotonic_time();
const int64_t elapsed_time_ms = (clock2 - clock1) / 1000; const int64_t elapsed_time_ms = (clock2 - clock1) / 1000;
if((LXVST_sched_timer_interval != 0) && elapsed_time_ms >= LXVST_sched_timer_interval) if ((LXVST_sched_timer_interval != 0) && elapsed_time_ms >= LXVST_sched_timer_interval) {
{ //printf ("elapsed %d ms ^= %.2f Hz\n", elapsed_time_ms, 1000.0/ (double)elapsed_time_ms); // DEBUG
//printf("elapsed %d ms ^= %.2f Hz\n", elapsed_time_ms, 1000.0/(double)elapsed_time_ms); // DEBUG
pthread_mutex_lock (&plugin_mutex); pthread_mutex_lock (&plugin_mutex);
again: again:
@ -445,8 +445,9 @@ again:
vstfx->plugin->dispatcher (vstfx->plugin, effEditIdle, 0, 0, NULL, 0); vstfx->plugin->dispatcher (vstfx->plugin, effEditIdle, 0, 0, NULL, 0);
if(vstfx->wantIdle) if (vstfx->wantIdle) {
vstfx->plugin->dispatcher (vstfx->plugin, 53, 0, 0, NULL, 0); vstfx->plugin->dispatcher (vstfx->plugin, 53, 0, 0, NULL, 0);
}
pthread_mutex_unlock (&vstfx->lock); pthread_mutex_unlock (&vstfx->lock);
} }
@ -456,12 +457,12 @@ again:
} }
if (!gui_quit && may_sleep && elapsed_time_ms + 1 < LXVST_sched_timer_interval) { if (!gui_quit && may_sleep && elapsed_time_ms + 1 < LXVST_sched_timer_interval) {
Glib::usleep(1000 * (LXVST_sched_timer_interval - elapsed_time_ms - 1)); Glib::usleep (1000 * (LXVST_sched_timer_interval - elapsed_time_ms - 1));
} }
} }
if (LXVST_XDisplay) { if (LXVST_XDisplay) {
XCloseDisplay(LXVST_XDisplay); XCloseDisplay (LXVST_XDisplay);
LXVST_XDisplay = 0; LXVST_XDisplay = 0;
} }
@ -506,12 +507,12 @@ int vstfx_init (void* ptr)
/*Init the attribs to defaults*/ /*Init the attribs to defaults*/
pthread_attr_init(&thread_attributes); pthread_attr_init (&thread_attributes);
/*Make sure the thread is joinable - this should be the default anyway - /*Make sure the thread is joinable - this should be the default anyway -
so we can join to it on vstfx_exit*/ so we can join to it on vstfx_exit*/
pthread_attr_setdetachstate(&thread_attributes, PTHREAD_CREATE_JOINABLE); pthread_attr_setdetachstate (&thread_attributes, PTHREAD_CREATE_JOINABLE);
/*This is where we need to open a connection to X, and start the GUI thread*/ /*This is where we need to open a connection to X, and start the GUI thread*/
@ -520,13 +521,13 @@ int vstfx_init (void* ptr)
will talk to X down this connection - X cannot handle multi-threaded access via will talk to X down this connection - X cannot handle multi-threaded access via
the same Display* */ the same Display* */
if(LXVST_XDisplay==NULL) if (LXVST_XDisplay == NULL) {
LXVST_XDisplay = XOpenDisplay(NULL); //We might be able to make this open a specific screen etc LXVST_XDisplay = XOpenDisplay (NULL); //We might be able to make this open a specific screen etc
}
/*Drop out and report the error if we fail to connect to X */ /*Drop out and report the error if we fail to connect to X */
if(LXVST_XDisplay==NULL) if (LXVST_XDisplay == NULL) {
{
vstfx_error ("** ERROR ** VSTFX: Failed opening connection to X"); vstfx_error ("** ERROR ** VSTFX: Failed opening connection to X");
return -1; return -1;
@ -536,15 +537,15 @@ int vstfx_init (void* ptr)
/*Create the thread - use default attrs for now, don't think we need anything special*/ /*Create the thread - use default attrs for now, don't think we need anything special*/
thread_create_result = pthread_create(&LXVST_gui_event_thread, &thread_attributes, gui_event_loop, NULL); thread_create_result = pthread_create (&LXVST_gui_event_thread, &thread_attributes, gui_event_loop, NULL);
if(thread_create_result!=0) if (thread_create_result != 0)
{ {
/*There was a problem starting the GUI event thread*/ /*There was a problem starting the GUI event thread*/
vstfx_error ("** ERROR ** VSTFX: Failed starting GUI event thread"); vstfx_error ("** ERROR ** VSTFX: Failed starting GUI event thread");
XCloseDisplay(LXVST_XDisplay); XCloseDisplay (LXVST_XDisplay);
LXVST_XDisplay = 0; LXVST_XDisplay = 0;
gui_quit = 1; gui_quit = 1;
@ -556,7 +557,7 @@ int vstfx_init (void* ptr)
/*The vstfx Quit function*/ /*The vstfx Quit function*/
void vstfx_exit() void vstfx_exit ()
{ {
if (gui_quit) { if (gui_quit) {
return; return;
@ -727,7 +728,7 @@ vstfx_launch_editor (VSTState* vstfx)
/* linuxDSP VSTs don't use the host Display* at all */ /* linuxDSP VSTs don't use the host Display* at all */
/**************************************************************/ /**************************************************************/
vstfx->plugin->dispatcher (vstfx->plugin, effEditOpen, 0, (long)LXVST_XDisplay, (void*)(parent_window), 0 ); vstfx->plugin->dispatcher (vstfx->plugin, effEditOpen, 0, (long)LXVST_XDisplay, (void*)(parent_window), 0);
/*QUIRK - some plugins need a slight delay after opening the editor before you can /*QUIRK - some plugins need a slight delay after opening the editor before you can
ask the window size or they might return zero - specifically discoDSP */ ask the window size or they might return zero - specifically discoDSP */
@ -736,7 +737,7 @@ vstfx_launch_editor (VSTState* vstfx)
/*Now we can find out how big the parent window should be (and try) to resize it*/ /*Now we can find out how big the parent window should be (and try) to resize it*/
vstfx->plugin->dispatcher (vstfx->plugin, effEditGetRect, 0, 0, &er, 0 ); vstfx->plugin->dispatcher (vstfx->plugin, effEditGetRect, 0, 0, &er, 0);
if (er) { if (er) {
// Don't crash is plugin does not implement effEditGetRect // Don't crash is plugin does not implement effEditGetRect
@ -748,7 +749,7 @@ vstfx_launch_editor (VSTState* vstfx)
vstfx->width = x_size; vstfx->width = x_size;
vstfx->height = y_size; vstfx->height = y_size;
XResizeWindow(LXVST_XDisplay, parent_window, x_size, y_size); XResizeWindow (LXVST_XDisplay, parent_window, x_size, y_size);
XFlush (LXVST_XDisplay); XFlush (LXVST_XDisplay);
@ -801,7 +802,7 @@ vstfx_event_loop_remove_plugin (VSTState* vstfx)
// if this function is called, there must be // if this function is called, there must be
// at least one plugin in the linked list // at least one plugin in the linked list
assert(vstfx_first); assert (vstfx_first);
if (vstfx_first == vstfx) { if (vstfx_first == vstfx) {
vstfx_first = vstfx_first->next; vstfx_first = vstfx_first->next;

18
gtk2_ardour/panner2d.cc
View file

@ -839,15 +839,15 @@ void
Panner2d::cart_to_gtk (CartesianVector& c) const Panner2d::cart_to_gtk (CartesianVector& c) const
{ {
/* cartesian coordinate space: /* cartesian coordinate space:
center = 0.0 * center = 0.0
dimension = 2.0 * 2.0 * dimension = 2.0 * 2.0
increasing y moves up * increasing y moves up
so max values along each axis are -1..+1 * so max values along each axis are -1..+1
*
GTK uses a coordinate space that is: * GTK uses a coordinate space that is:
top left = 0.0 * top left = 0.0
dimension = (radius*2.0) * (radius*2.0) * dimension = (radius*2.0) * (radius*2.0)
increasing y moves down * increasing y moves down
*/ */
const double diameter = radius*2.0; const double diameter = radius*2.0;

2
gtk2_ardour/route_params_ui.cc
View file

@ -353,7 +353,7 @@ void
RouteParams_UI::cleanup_view (bool stopupdate) RouteParams_UI::cleanup_view (bool stopupdate)
{ {
if (_active_view) { if (_active_view) {
GenericPluginUI * plugui = 0; GenericPluginUI* plugui = 0;
if (stopupdate && (plugui = dynamic_cast<GenericPluginUI*>(_active_view)) != 0) { if (stopupdate && (plugui = dynamic_cast<GenericPluginUI*>(_active_view)) != 0) {
plugui->stop_updating (0); plugui->stop_updating (0);

9
gtk2_ardour/send_ui.cc
View file

@ -42,15 +42,6 @@ SendUI::SendUI (Gtk::Window* parent, boost::shared_ptr<Send> s, Session* session
{ {
assert (_send); assert (_send);
_panners.set_panner (s->panner_shell(), s->panner());
_gpm.set_controls (boost::shared_ptr<Route>(), s->meter(), s->amp(), s->gain_control());
_hbox.pack_start (_gpm, true, true);
set_name (X_("SendUIFrame"));
_vbox.set_spacing (5);
_vbox.set_border_width (5);
_vbox.pack_start (_hbox, false, false, false); _vbox.pack_start (_hbox, false, false, false);
_vbox.pack_start (_panners, false, false); _vbox.pack_start (_panners, false, false);

17
gtk2_ardour/sfdb_freesound_mootcher.h
View file

@ -76,7 +76,7 @@ public:
bool fetchAudioFile(std::string originalFileName, std::string ID, std::string audioURL, SoundFileBrowser *caller); bool fetchAudioFile(std::string originalFileName, std::string ID, std::string audioURL, SoundFileBrowser *caller);
std::string searchText(std::string query, int page, std::string filter, enum sortMethod sort); std::string searchText(std::string query, int page, std::string filter, enum sortMethod sort);
std::string searchSimilar(std::string id); std::string searchSimilar(std::string id);
void * threadFunc(); void* threadFunc();
SoundFileBrowser *sfb; SoundFileBrowser *sfb;
std::string audioFileName; std::string audioFileName;
std::string ID; std::string ID;
@ -90,16 +90,15 @@ public:
private: private:
void ensureWorkingDir ();
void ensureWorkingDir(); std::string doRequest (std::string uri, std::string params);
void setcUrlOptions ();
std::string doRequest(std::string uri, std::string params); static size_t WriteMemoryCallback (void *ptr, size_t size, size_t nmemb, void *data);
void setcUrlOptions(); static int progress_callback (void *clientp, double dltotal, double dlnow, double ultotal, double ulnow);
std::string sortMethodString (enum sortMethod sort);
static size_t WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data); std::string getSoundResourceFile (std::string ID);
static int progress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow);
std::string sortMethodString(enum sortMethod sort);
std::string getSoundResourceFile(std::string ID);
CURL *curl; CURL *curl;
char errorBuffer[CURL_ERROR_SIZE]; // storage for cUrl error message char errorBuffer[CURL_ERROR_SIZE]; // storage for cUrl error message

4
gtk2_ardour/speaker_dialog.cc
View file

@ -250,8 +250,8 @@ SpeakerDialog::darea_size_allocate (Gtk::Allocation& alloc)
height = alloc.get_height(); height = alloc.get_height();
/* The allocation will (should) be rectangualar, but make the basic /* The allocation will (should) be rectangualar, but make the basic
drawing square; space to the right of the square is for over-hanging * drawing square; space to the right of the square is for over-hanging
text labels. * text labels.
*/ */
width = height; width = height;

2
gtk2_ardour/utils.cc
View file

@ -405,7 +405,7 @@ ARDOUR_UI_UTILS::get_xpm (std::string name)
try { try {
xpm_map[name] = Gdk::Pixbuf::create_from_file (data_file_path); xpm_map[name] = Gdk::Pixbuf::create_from_file (data_file_path);
} catch(const Glib::Error& e) { } catch (const Glib::Error& e) {
warning << "Caught Glib::Error: " << e.what() << endmsg; warning << "Caught Glib::Error: " << e.what() << endmsg;
} }
} }