NO-OP: whitespace
This fixes mostly <tab> after <space> and similar <tab> not used for indenting as well as some related code alignment issues.
This commit is contained in:
parent
90a7bef656
commit
31815b5f26
@ -86,9 +86,6 @@ PortExportChannelSelector::PortExportChannelSelector (ARDOUR::Session * session,
|
||||
|
||||
PortExportChannelSelector::~PortExportChannelSelector ()
|
||||
{
|
||||
// if (session) {
|
||||
// session->add_instant_xml (get_state(), false);
|
||||
// }
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -246,17 +246,9 @@ ExportTimespanSelector::construct_label (ARDOUR::Location const * location) cons
|
||||
break;
|
||||
}
|
||||
|
||||
// label += _("from ");
|
||||
|
||||
// label += "<span color=\"#7fff7f\">";
|
||||
label += start;
|
||||
// label += "</span>";
|
||||
|
||||
label += _(" to ");
|
||||
|
||||
// label += "<span color=\"#7fff7f\">";
|
||||
label += end;
|
||||
// label += "</span>";
|
||||
|
||||
return label;
|
||||
}
|
||||
|
@ -305,8 +305,9 @@ std::size_t s1pos, s2pos, n = 0;
|
||||
s1pos = s1.length();
|
||||
s2pos = s2.length();
|
||||
while (s1pos-- > 0 && s2pos-- > 0) {
|
||||
if (!match_or_digit(s1[s1pos], s2[s2pos]) )
|
||||
if (!match_or_digit(s1[s1pos], s2[s2pos])) {
|
||||
break;
|
||||
}
|
||||
n++;
|
||||
}
|
||||
return n;
|
||||
|
@ -44,7 +44,7 @@ using namespace Editing;
|
||||
using namespace ARDOUR;
|
||||
using ArdourCanvas::Duple;
|
||||
|
||||
GhostRegion::GhostRegion(RegionView& rv,
|
||||
GhostRegion::GhostRegion (RegionView& rv,
|
||||
ArdourCanvas::Container* parent,
|
||||
TimeAxisView& tv,
|
||||
TimeAxisView& source_tv,
|
||||
@ -116,7 +116,7 @@ GhostRegion::is_automation_ghost()
|
||||
return (dynamic_cast<AutomationTimeAxisView*>(&trackview)) != 0;
|
||||
}
|
||||
|
||||
AudioGhostRegion::AudioGhostRegion(RegionView& rv,
|
||||
AudioGhostRegion::AudioGhostRegion (RegionView& rv,
|
||||
TimeAxisView& tv,
|
||||
TimeAxisView& source_tv,
|
||||
double initial_unit_pos)
|
||||
@ -200,7 +200,7 @@ MidiGhostRegion::MidiGhostRegion(MidiRegionView& rv,
|
||||
MidiStreamView& msv,
|
||||
TimeAxisView& source_tv,
|
||||
double initial_unit_pos)
|
||||
: GhostRegion(rv,
|
||||
: GhostRegion (rv,
|
||||
msv.midi_underlay_group,
|
||||
msv.trackview(),
|
||||
source_tv,
|
||||
@ -465,7 +465,6 @@ MidiGhostRegion::redisplay_model ()
|
||||
* representation of it.
|
||||
* @return Our Event, or 0 if not found.
|
||||
*/
|
||||
|
||||
MidiGhostRegion::GhostEvent *
|
||||
MidiGhostRegion::find_event (boost::shared_ptr<NoteType> parent)
|
||||
{
|
||||
|
@ -35,10 +35,10 @@ G_BEGIN_DECLS
|
||||
typedef struct _PianoKeyboard PianoKeyboard;
|
||||
typedef struct _PianoKeyboardClass PianoKeyboardClass;
|
||||
|
||||
#define NNOTES 127
|
||||
#define NNOTES (127)
|
||||
|
||||
#define OCTAVE_MIN -1
|
||||
#define OCTAVE_MAX 7
|
||||
#define OCTAVE_MIN (-1)
|
||||
#define OCTAVE_MAX (7)
|
||||
|
||||
struct PKNote {
|
||||
int pressed; /* 1 if key is in pressed down state. */
|
||||
@ -63,7 +63,7 @@ struct _PianoKeyboard
|
||||
gboolean monophonic;
|
||||
struct PKNote notes[NNOTES];
|
||||
/* Table used to translate from PC keyboard character to MIDI note number. */
|
||||
GHashTable *key_bindings;
|
||||
GHashTable* key_bindings;
|
||||
};
|
||||
|
||||
struct _PianoKeyboardClass
|
||||
@ -73,6 +73,7 @@ struct _PianoKeyboardClass
|
||||
|
||||
GType piano_keyboard_get_type (void) G_GNUC_CONST;
|
||||
GtkWidget* piano_keyboard_new (void);
|
||||
|
||||
void piano_keyboard_sustain_press (PianoKeyboard *pk);
|
||||
void piano_keyboard_sustain_release (PianoKeyboard *pk);
|
||||
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_monophonic (PianoKeyboard *pk, gboolean monophonic);
|
||||
void piano_keyboard_set_octave (PianoKeyboard *pk, int octave);
|
||||
|
||||
gboolean piano_keyboard_set_keyboard_layout (PianoKeyboard *pk, const char *layout);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __PIANO_KEYBOARD_H__ */
|
||||
|
||||
|
@ -71,7 +71,7 @@ static pthread_t LXVST_gui_event_thread;
|
||||
|
||||
static bool LXVST_xerror;
|
||||
|
||||
int TempErrorHandler(Display *display, XErrorEvent *e)
|
||||
int TempErrorHandler (Display *display, XErrorEvent *e)
|
||||
{
|
||||
LXVST_xerror = true;
|
||||
|
||||
@ -80,7 +80,7 @@ int TempErrorHandler(Display *display, XErrorEvent *e)
|
||||
|
||||
#ifdef LXVST_32BIT
|
||||
|
||||
int getXWindowProperty(Window window, Atom atom)
|
||||
int getXWindowProperty (Window window, Atom atom)
|
||||
{
|
||||
int result = 0;
|
||||
int userSize;
|
||||
@ -95,25 +95,26 @@ int getXWindowProperty(Window window, Atom atom)
|
||||
qutting the entire application because of e.g. an invalid
|
||||
window ID*/
|
||||
|
||||
XErrorHandler olderrorhandler = XSetErrorHandler(TempErrorHandler);
|
||||
XErrorHandler olderrorhandler = XSetErrorHandler (TempErrorHandler);
|
||||
|
||||
XGetWindowProperty( LXVST_XDisplay, //The display
|
||||
window, //The Window
|
||||
atom, //The property
|
||||
0, //Offset into the data
|
||||
1, //Number of 32Bit chunks of data
|
||||
false, //false = don't delete the property
|
||||
AnyPropertyType, //Required property type mask
|
||||
&userType, //Actual type returned
|
||||
&userSize, //Actual format returned
|
||||
&userCount, //Actual number of items stored in the returned data
|
||||
&bytes, //Number of bytes remaining if a partial read
|
||||
&data); //The actual data read
|
||||
XGetWindowProperty (LXVST_XDisplay, // The display
|
||||
window, // The Window
|
||||
atom, // The property
|
||||
0, // Offset into the data
|
||||
1, // Number of 32Bit chunks of data
|
||||
false, // false = don't delete the property
|
||||
AnyPropertyType, // Required property type mask
|
||||
&userType, // Actual type returned
|
||||
&userSize, // Actual format returned
|
||||
&userCount, // Actual number of items stored in the returned data
|
||||
&bytes, // Number of bytes remaining if a partial read
|
||||
&data); // The actual data read
|
||||
|
||||
if(LXVST_xerror == false && userCount == 1)
|
||||
if (LXVST_xerror == false && userCount == 1) {
|
||||
result = *(int*)data;
|
||||
}
|
||||
|
||||
XSetErrorHandler(olderrorhandler);
|
||||
XSetErrorHandler (olderrorhandler);
|
||||
|
||||
/*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 */
|
||||
/********************************************************************/
|
||||
|
||||
long getXWindowProperty(Window window, Atom atom)
|
||||
long getXWindowProperty (Window window, Atom atom)
|
||||
{
|
||||
long result = 0;
|
||||
int userSize;
|
||||
@ -140,13 +141,14 @@ long getXWindowProperty(Window window, Atom atom)
|
||||
LXVST_xerror = false;
|
||||
|
||||
/*Use our own Xerror handler while we're in here - in an
|
||||
attempt to stop the brain dead default Xerror behaviour of
|
||||
qutting the entire application because of e.g. an invalid
|
||||
window ID*/
|
||||
* attempt to stop the brain dead default Xerror behaviour of
|
||||
* qutting the entire application because of e.g. an invalid
|
||||
* window ID
|
||||
*/
|
||||
|
||||
XErrorHandler olderrorhandler = XSetErrorHandler(TempErrorHandler);
|
||||
XErrorHandler olderrorhandler = XSetErrorHandler (TempErrorHandler);
|
||||
|
||||
XGetWindowProperty( LXVST_XDisplay,
|
||||
XGetWindowProperty (LXVST_XDisplay,
|
||||
window,
|
||||
atom,
|
||||
0,
|
||||
@ -159,10 +161,11 @@ long getXWindowProperty(Window window, Atom atom)
|
||||
&bytes,
|
||||
&data);
|
||||
|
||||
if(LXVST_xerror == false && userCount == 1)
|
||||
if (LXVST_xerror == false && userCount == 1) {
|
||||
result = *(long*)data;
|
||||
}
|
||||
|
||||
XSetErrorHandler(olderrorhandler);
|
||||
XSetErrorHandler (olderrorhandler);
|
||||
|
||||
/*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*/
|
||||
|
||||
switch(event->type)
|
||||
switch (event->type)
|
||||
{
|
||||
/*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)) {
|
||||
#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,
|
||||
vstfx->width, vstfx->height
|
||||
);
|
||||
@ -246,7 +249,7 @@ dispatch_x_events (XEvent* event, VSTState* vstfx)
|
||||
|
||||
vstfx->linux_plugin_ui_window = PluginUIWindowID;
|
||||
#ifdef LXVST_32BIT
|
||||
int result = getXWindowProperty(PluginUIWindowID, XInternAtom(LXVST_XDisplay, "_XEventProc", false));
|
||||
int result = getXWindowProperty (PluginUIWindowID, XInternAtom (LXVST_XDisplay, "_XEventProc", false));
|
||||
|
||||
if (result == 0) {
|
||||
vstfx->eventProc = NULL;
|
||||
@ -255,12 +258,13 @@ dispatch_x_events (XEvent* event, VSTState* vstfx)
|
||||
}
|
||||
#endif
|
||||
#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;
|
||||
else
|
||||
} else {
|
||||
vstfx->eventProc = (void (*) (void* event))result;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
break;
|
||||
@ -276,15 +280,15 @@ dispatch_x_events (XEvent* event, VSTState* vstfx)
|
||||
to effEditOpen when the editor is launched*/
|
||||
|
||||
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) {
|
||||
vstfx_launch_editor (vstfx);
|
||||
}
|
||||
}
|
||||
|
||||
XFree(message);
|
||||
XFree (message);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@ -306,7 +310,7 @@ dispatch_x_events (XEvent* event, VSTState* vstfx)
|
||||
return;
|
||||
}
|
||||
|
||||
vstfx->eventProc((void*)event);
|
||||
vstfx->eventProc ((void*)event);
|
||||
}
|
||||
|
||||
/** 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;
|
||||
|
||||
if(LXVST_XDisplay)
|
||||
{
|
||||
if (LXVST_XDisplay) {
|
||||
/*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) {
|
||||
// keep dispatching events as fast as possible
|
||||
@ -346,19 +349,17 @@ void* gui_event_loop (void* ptr)
|
||||
|
||||
/*process them if there are any*/
|
||||
|
||||
while(num_events)
|
||||
{
|
||||
XNextEvent(LXVST_XDisplay, &event);
|
||||
while (num_events) {
|
||||
XNextEvent (LXVST_XDisplay, &event);
|
||||
|
||||
/*Call dispatch events, with the event, for each plugin in the linked list*/
|
||||
|
||||
for (vstfx = vstfx_first; vstfx; vstfx = vstfx->next)
|
||||
{
|
||||
pthread_mutex_lock(&vstfx->lock);
|
||||
for (vstfx = vstfx_first; vstfx; vstfx = vstfx->next) {
|
||||
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--;
|
||||
@ -367,16 +368,15 @@ void* gui_event_loop (void* ptr)
|
||||
|
||||
/*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*/
|
||||
|
||||
clock2 = g_get_monotonic_time();
|
||||
const int64_t elapsed_time_ms = (clock2 - clock1) / 1000;
|
||||
|
||||
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
|
||||
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
|
||||
pthread_mutex_lock (&plugin_mutex);
|
||||
|
||||
again:
|
||||
@ -445,8 +445,9 @@ again:
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
pthread_mutex_unlock (&vstfx->lock);
|
||||
}
|
||||
@ -456,12 +457,12 @@ again:
|
||||
}
|
||||
|
||||
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) {
|
||||
XCloseDisplay(LXVST_XDisplay);
|
||||
XCloseDisplay (LXVST_XDisplay);
|
||||
LXVST_XDisplay = 0;
|
||||
}
|
||||
|
||||
@ -506,12 +507,12 @@ int vstfx_init (void* ptr)
|
||||
|
||||
/*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 -
|
||||
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*/
|
||||
@ -520,13 +521,13 @@ int vstfx_init (void* ptr)
|
||||
will talk to X down this connection - X cannot handle multi-threaded access via
|
||||
the same Display* */
|
||||
|
||||
if(LXVST_XDisplay==NULL)
|
||||
LXVST_XDisplay = XOpenDisplay(NULL); //We might be able to make this open a specific screen etc
|
||||
if (LXVST_XDisplay == NULL) {
|
||||
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 */
|
||||
|
||||
if(LXVST_XDisplay==NULL)
|
||||
{
|
||||
if (LXVST_XDisplay == NULL) {
|
||||
vstfx_error ("** ERROR ** VSTFX: Failed opening connection to X");
|
||||
|
||||
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*/
|
||||
|
||||
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*/
|
||||
|
||||
vstfx_error ("** ERROR ** VSTFX: Failed starting GUI event thread");
|
||||
|
||||
XCloseDisplay(LXVST_XDisplay);
|
||||
XCloseDisplay (LXVST_XDisplay);
|
||||
LXVST_XDisplay = 0;
|
||||
gui_quit = 1;
|
||||
|
||||
@ -556,7 +557,7 @@ int vstfx_init (void* ptr)
|
||||
|
||||
/*The vstfx Quit function*/
|
||||
|
||||
void vstfx_exit()
|
||||
void vstfx_exit ()
|
||||
{
|
||||
if (gui_quit) {
|
||||
return;
|
||||
@ -727,7 +728,7 @@ vstfx_launch_editor (VSTState* vstfx)
|
||||
/* 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
|
||||
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*/
|
||||
|
||||
vstfx->plugin->dispatcher (vstfx->plugin, effEditGetRect, 0, 0, &er, 0 );
|
||||
vstfx->plugin->dispatcher (vstfx->plugin, effEditGetRect, 0, 0, &er, 0);
|
||||
|
||||
if (er) {
|
||||
// Don't crash is plugin does not implement effEditGetRect
|
||||
@ -748,7 +749,7 @@ vstfx_launch_editor (VSTState* vstfx)
|
||||
vstfx->width = x_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);
|
||||
|
||||
@ -801,7 +802,7 @@ vstfx_event_loop_remove_plugin (VSTState* vstfx)
|
||||
|
||||
// if this function is called, there must be
|
||||
// at least one plugin in the linked list
|
||||
assert(vstfx_first);
|
||||
assert (vstfx_first);
|
||||
|
||||
if (vstfx_first == vstfx) {
|
||||
vstfx_first = vstfx_first->next;
|
||||
|
@ -839,15 +839,15 @@ void
|
||||
Panner2d::cart_to_gtk (CartesianVector& c) const
|
||||
{
|
||||
/* cartesian coordinate space:
|
||||
center = 0.0
|
||||
dimension = 2.0 * 2.0
|
||||
increasing y moves up
|
||||
so max values along each axis are -1..+1
|
||||
|
||||
GTK uses a coordinate space that is:
|
||||
top left = 0.0
|
||||
dimension = (radius*2.0) * (radius*2.0)
|
||||
increasing y moves down
|
||||
* center = 0.0
|
||||
* dimension = 2.0 * 2.0
|
||||
* increasing y moves up
|
||||
* so max values along each axis are -1..+1
|
||||
*
|
||||
* GTK uses a coordinate space that is:
|
||||
* top left = 0.0
|
||||
* dimension = (radius*2.0) * (radius*2.0)
|
||||
* increasing y moves down
|
||||
*/
|
||||
const double diameter = radius*2.0;
|
||||
|
||||
|
@ -353,7 +353,7 @@ void
|
||||
RouteParams_UI::cleanup_view (bool stopupdate)
|
||||
{
|
||||
if (_active_view) {
|
||||
GenericPluginUI * plugui = 0;
|
||||
GenericPluginUI* plugui = 0;
|
||||
|
||||
if (stopupdate && (plugui = dynamic_cast<GenericPluginUI*>(_active_view)) != 0) {
|
||||
plugui->stop_updating (0);
|
||||
|
@ -42,15 +42,6 @@ SendUI::SendUI (Gtk::Window* parent, boost::shared_ptr<Send> s, Session* session
|
||||
{
|
||||
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 (_panners, false, false);
|
||||
|
||||
|
@ -76,7 +76,7 @@ public:
|
||||
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 searchSimilar(std::string id);
|
||||
void * threadFunc();
|
||||
void* threadFunc();
|
||||
SoundFileBrowser *sfb;
|
||||
std::string audioFileName;
|
||||
std::string ID;
|
||||
@ -90,16 +90,15 @@ public:
|
||||
|
||||
|
||||
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);
|
||||
void setcUrlOptions();
|
||||
|
||||
static size_t WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data);
|
||||
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);
|
||||
static size_t WriteMemoryCallback (void *ptr, size_t size, size_t nmemb, void *data);
|
||||
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;
|
||||
char errorBuffer[CURL_ERROR_SIZE]; // storage for cUrl error message
|
||||
|
@ -250,8 +250,8 @@ SpeakerDialog::darea_size_allocate (Gtk::Allocation& alloc)
|
||||
height = alloc.get_height();
|
||||
|
||||
/* The allocation will (should) be rectangualar, but make the basic
|
||||
drawing square; space to the right of the square is for over-hanging
|
||||
text labels.
|
||||
* drawing square; space to the right of the square is for over-hanging
|
||||
* text labels.
|
||||
*/
|
||||
width = height;
|
||||
|
||||
|
@ -405,7 +405,7 @@ ARDOUR_UI_UTILS::get_xpm (std::string name)
|
||||
|
||||
try {
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user