summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-04-16 19:02:36 +0000
committerDavid Robillard <d@drobilla.net>2011-04-16 19:02:36 +0000
commit1ac86ca2e5e32bd8bb34bba1589e2152004dc9a6 (patch)
treebbeed636819fc3e67e77e2645a699e01fd0d2e16 /src
parent7627989d3fbc7fd54013988d2ec7c29a5c517bbf (diff)
downloadpatchage-1ac86ca2e5e32bd8bb34bba1589e2152004dc9a6.tar.gz
patchage-1ac86ca2e5e32bd8bb34bba1589e2152004dc9a6.tar.bz2
patchage-1ac86ca2e5e32bd8bb34bba1589e2152004dc9a6.zip
Squeeze blank lines and delete trailing whitespace.
git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@3152 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
-rw-r--r--src/AlsaDriver.cpp24
-rw-r--r--src/AlsaDriver.hpp4
-rw-r--r--src/DBus.cpp2
-rw-r--r--src/Driver.hpp1
-rw-r--r--src/GladeFile.hpp2
-rw-r--r--src/JackDriver.cpp26
-rw-r--r--src/JackDriver.hpp2
-rw-r--r--src/LashProxy.cpp5
-rw-r--r--src/LoadProjectDialog.cpp5
-rw-r--r--src/Patchage.cpp33
-rw-r--r--src/PatchageCanvas.cpp10
-rw-r--r--src/PatchageCanvas.hpp5
-rw-r--r--src/PatchageEvent.hpp1
-rw-r--r--src/PatchageModule.hpp1
-rw-r--r--src/PatchagePort.hpp1
-rw-r--r--src/ProjectPropertiesDialog.cpp4
-rw-r--r--src/StateManager.cpp11
-rw-r--r--src/StateManager.hpp1
-rw-r--r--src/Widget.hpp1
-rw-r--r--src/main.cpp9
20 files changed, 16 insertions, 132 deletions
diff --git a/src/AlsaDriver.cpp b/src/AlsaDriver.cpp
index 6cb51ae..35f41fa 100644
--- a/src/AlsaDriver.cpp
+++ b/src/AlsaDriver.cpp
@@ -37,13 +37,11 @@ AlsaDriver::AlsaDriver(Patchage* app)
{
}
-
AlsaDriver::~AlsaDriver()
{
detach();
}
-
/** Attach to ALSA.
* @a launch_daemon is ignored, as ALSA has no daemon to launch/connect to.
*/
@@ -71,7 +69,6 @@ AlsaDriver::attach(bool /*launch_daemon*/)
}
}
-
void
AlsaDriver::detach()
{
@@ -85,7 +82,6 @@ AlsaDriver::detach()
}
}
-
/** Refresh all Alsa Midi ports and connections.
*/
void
@@ -100,7 +96,6 @@ AlsaDriver::refresh()
refresh_connections();
}
-
boost::shared_ptr<PatchagePort>
AlsaDriver::create_port_view(Patchage* patchage,
const PortID& id)
@@ -111,7 +106,6 @@ AlsaDriver::create_port_view(Patchage* patchage,
return port;
}
-
boost::shared_ptr<PatchageModule>
AlsaDriver::find_or_create_module(
Patchage* patchage,
@@ -128,7 +122,6 @@ AlsaDriver::find_or_create_module(
return m;
}
-
void
AlsaDriver::create_port_view_internal(
Patchage* patchage,
@@ -217,7 +210,6 @@ AlsaDriver::create_port_view_internal(
}
}
-
boost::shared_ptr<PatchagePort>
AlsaDriver::create_port(boost::shared_ptr<PatchageModule> parent,
const string& name, bool is_input, snd_seq_addr_t addr)
@@ -225,7 +217,7 @@ AlsaDriver::create_port(boost::shared_ptr<PatchageModule> parent,
boost::shared_ptr<PatchagePort> ret(
new PatchagePort(parent, ALSA_MIDI, name, is_input,
_app->state_manager()->get_port_color(ALSA_MIDI)));
-
+
boost::shared_ptr<PatchageCanvas> canvas
= boost::dynamic_pointer_cast<PatchageCanvas>(parent->canvas().lock());
if (canvas)
@@ -235,7 +227,6 @@ AlsaDriver::create_port(boost::shared_ptr<PatchageModule> parent,
return ret;
}
-
bool
AlsaDriver::ignore(const snd_seq_addr_t& addr, bool add)
{
@@ -258,7 +249,7 @@ AlsaDriver::ignore(const snd_seq_addr_t& addr, bool add)
const int type = snd_seq_port_info_get_type(pinfo);
const int caps = snd_seq_port_info_get_capability(pinfo);
-
+
if (caps & SND_SEQ_PORT_CAP_NO_EXPORT) {
_ignored.insert(addr);
return true;
@@ -277,7 +268,6 @@ AlsaDriver::ignore(const snd_seq_addr_t& addr, bool add)
return false;
}
-
/** Refresh all Alsa Midi ports.
*/
void
@@ -312,7 +302,6 @@ AlsaDriver::refresh_ports()
}
}
-
/** Refresh all Alsa Midi connections.
*/
void
@@ -337,7 +326,6 @@ AlsaDriver::refresh_connections()
}
}
-
/** Add all connections for the given port.
*/
void
@@ -375,7 +363,6 @@ AlsaDriver::add_connections(boost::shared_ptr<PatchagePort> port)
}
-
/** Connects two Alsa Midi ports.
*
* \return Whether connection succeeded.
@@ -420,7 +407,6 @@ AlsaDriver::connect(boost::shared_ptr<PatchagePort> src_port, boost::shared_ptr<
return (!result);
}
-
/** Disconnects two Alsa Midi ports.
*
* \return Whether disconnection succeeded.
@@ -457,7 +443,6 @@ AlsaDriver::disconnect(boost::shared_ptr<PatchagePort> src_port, boost::shared_p
return true;
}
-
bool
AlsaDriver::create_refresh_port()
{
@@ -488,7 +473,6 @@ AlsaDriver::create_refresh_port()
return true;
}
-
void*
AlsaDriver::refresh_main(void* me)
{
@@ -497,7 +481,6 @@ AlsaDriver::refresh_main(void* me)
return NULL;
}
-
void
AlsaDriver::_refresh_main()
{
@@ -518,7 +501,7 @@ AlsaDriver::_refresh_main()
snd_seq_event_t* ev;
while (snd_seq_event_input(_seq, &ev) > 0) {
assert(ev);
-
+
Glib::Mutex::Lock lock(_events_mutex);
switch (ev->type) {
@@ -564,7 +547,6 @@ AlsaDriver::_refresh_main()
}
}
-
void
AlsaDriver::process_events(Patchage* app)
{
diff --git a/src/AlsaDriver.hpp b/src/AlsaDriver.hpp
index 43647cc..8ccc4bf 100644
--- a/src/AlsaDriver.hpp
+++ b/src/AlsaDriver.hpp
@@ -58,7 +58,7 @@ public:
void print_addr(snd_seq_addr_t addr);
void process_events(Patchage* app);
-
+
private:
void refresh_ports();
void refresh_connections();
@@ -91,7 +91,7 @@ private:
Patchage* _app;
snd_seq_t* _seq;
pthread_t _refresh_thread;
-
+
Glib::Mutex _events_mutex;
std::queue<PatchageEvent> _events;
diff --git a/src/DBus.cpp b/src/DBus.cpp
index 065aae4..13c3b3d 100644
--- a/src/DBus.cpp
+++ b/src/DBus.cpp
@@ -25,7 +25,6 @@
#define DBUS_CALL_DEFAULT_TIMEOUT 1000 // in milliseconds
-
DBus::DBus(Patchage* app)
: _app(app)
, _connection(NULL)
@@ -43,7 +42,6 @@ DBus::DBus(Patchage* app)
dbus_connection_setup_with_g_main(_connection, NULL);
}
-
bool
DBus::call(
bool response_expected,
diff --git a/src/Driver.hpp b/src/Driver.hpp
index 6584688..8f2b0be 100644
--- a/src/Driver.hpp
+++ b/src/Driver.hpp
@@ -56,6 +56,5 @@ public:
sigc::signal<void> signal_detached;
};
-
#endif // PATCHAGE_DRIVER_HPP
diff --git a/src/GladeFile.hpp b/src/GladeFile.hpp
index da9ea3b..9f977b2 100644
--- a/src/GladeFile.hpp
+++ b/src/GladeFile.hpp
@@ -40,7 +40,7 @@ public:
fs.close();
return !fail;
}
-
+
static Glib::RefPtr<Gnome::Glade::Xml> open(const std::string& base_name) {
std::string glade_filename;
char* loc = NULL;
diff --git a/src/JackDriver.cpp b/src/JackDriver.cpp
index 45e8b93..d0518ac 100644
--- a/src/JackDriver.cpp
+++ b/src/JackDriver.cpp
@@ -49,13 +49,11 @@ JackDriver::JackDriver(Patchage* app)
_last_pos.valid = (jack_position_bits_t)0;
}
-
JackDriver::~JackDriver()
{
detach();
}
-
/** Connect to Jack.
*/
void
@@ -97,7 +95,6 @@ JackDriver::attach(bool launch_daemon)
}
}
-
void
JackDriver::detach()
{
@@ -112,7 +109,6 @@ JackDriver::detach()
_app->status_msg("[JACK] Detached");
}
-
/** Destroy all JACK (canvas) ports.
*/
void
@@ -139,7 +135,6 @@ JackDriver::destroy_all()
}
}
-
boost::shared_ptr<PatchagePort>
JackDriver::create_port_view(Patchage* patchage,
const PortID& id)
@@ -197,7 +192,6 @@ JackDriver::create_port_view(Patchage* patchage,
return port;
}
-
boost::shared_ptr<PatchagePort>
JackDriver::create_port(boost::shared_ptr<PatchageModule> parent, jack_port_t* port, PortID id)
{
@@ -231,14 +225,12 @@ JackDriver::create_port(boost::shared_ptr<PatchageModule> parent, jack_port_t* p
return ret;
}
-
void
JackDriver::shutdown()
{
signal_detached.emit();
}
-
/** Refresh all Jack audio ports/connections.
* To be called from GTK thread only.
*/
@@ -373,7 +365,6 @@ JackDriver::refresh()
free(ports);
}
-
bool
JackDriver::port_names(const PortID& id,
string& module_name,
@@ -398,7 +389,6 @@ JackDriver::port_names(const PortID& id,
return true;
}
-
/** Connects two Jack audio ports.
* To be called from GTK thread only.
* \return Whether connection succeeded.
@@ -421,7 +411,6 @@ JackDriver::connect(boost::shared_ptr<PatchagePort> src_port, boost::shared_ptr<
return (!result);
}
-
/** Disconnects two Jack audio ports.
* To be called from GTK thread only.
* \return Whether disconnection succeeded.
@@ -444,7 +433,6 @@ JackDriver::disconnect(boost::shared_ptr<PatchagePort> const src_port, boost::sh
return (!result);
}
-
void
JackDriver::jack_client_registration_cb(const char* name, int registered, void* jack_driver)
{
@@ -461,7 +449,6 @@ JackDriver::jack_client_registration_cb(const char* name, int registered, void*
}
}
-
void
JackDriver::jack_port_registration_cb(jack_port_id_t port_id, int registered, void* jack_driver)
{
@@ -478,7 +465,6 @@ JackDriver::jack_port_registration_cb(jack_port_id_t port_id, int registered, vo
}
}
-
void
JackDriver::jack_port_connect_cb(jack_port_id_t src, jack_port_id_t dst, int connect, void* jack_driver)
{
@@ -495,7 +481,6 @@ JackDriver::jack_port_connect_cb(jack_port_id_t src, jack_port_id_t dst, int con
}
}
-
int
JackDriver::jack_graph_order_cb(void* jack_driver)
{
@@ -508,7 +493,6 @@ JackDriver::jack_graph_order_cb(void* jack_driver)
return 0;
}
-
int
JackDriver::jack_buffer_size_cb(jack_nframes_t buffer_size, void* jack_driver)
{
@@ -530,7 +514,6 @@ JackDriver::jack_buffer_size_cb(jack_nframes_t buffer_size, void* jack_driver)
return 0;
}
-
int
JackDriver::jack_xrun_cb(void* jack_driver)
{
@@ -545,7 +528,6 @@ JackDriver::jack_xrun_cb(void* jack_driver)
return 0;
}
-
void
JackDriver::jack_shutdown_cb(void* jack_driver)
{
@@ -558,14 +540,12 @@ JackDriver::jack_shutdown_cb(void* jack_driver)
me->signal_detached.emit();
}
-
void
JackDriver::error_cb(const char* msg)
{
Raul::error << "[JACK] " << msg << endl;
}
-
jack_nframes_t
JackDriver::buffer_size()
{
@@ -575,7 +555,6 @@ JackDriver::buffer_size()
return jack_get_buffer_size(_client);
}
-
void
JackDriver::reset_xruns()
{
@@ -583,7 +562,6 @@ JackDriver::reset_xruns()
_xrun_delay = 0;
}
-
bool
JackDriver::set_buffer_size(jack_nframes_t size)
{
@@ -604,7 +582,6 @@ JackDriver::set_buffer_size(jack_nframes_t size)
}
}
-
float
JackDriver::get_max_dsp_load()
{
@@ -624,7 +601,6 @@ JackDriver::get_max_dsp_load()
return max_load;
}
-
void
JackDriver::reset_max_dsp_load()
{
@@ -632,7 +608,6 @@ JackDriver::reset_max_dsp_load()
jack_reset_max_delayed_usecs(_client);
}
-
void
JackDriver::process_events(Patchage* app)
{
@@ -643,4 +618,3 @@ JackDriver::process_events(Patchage* app)
}
}
-
diff --git a/src/JackDriver.hpp b/src/JackDriver.hpp
index 79ca54f..7a93ff6 100644
--- a/src/JackDriver.hpp
+++ b/src/JackDriver.hpp
@@ -31,7 +31,6 @@ class PatchageFlowCanvas;
class PatchagePort;
class PatchageModule;
-
/** Handles all externally driven functionality, registering ports etc.
*
* Jack callbacks and connect methods and things like that live here.
@@ -112,5 +111,4 @@ private:
float _xrun_delay;
};
-
#endif // PATCHAGE_JACKDRIVER_HPP
diff --git a/src/LashProxy.cpp b/src/LashProxy.cpp
index 992060a..e47ba56 100644
--- a/src/LashProxy.cpp
+++ b/src/LashProxy.cpp
@@ -70,7 +70,7 @@ struct LashProxyImpl {
void get_loaded_project_properties(
const std::string& name,
LoadedProjectProperties& properties);
-
+
bool _server_responding;
Session* _session;
LashProxy* _interface;
@@ -215,7 +215,6 @@ LashProxyImpl::dbus_message_hook(
return DBUS_HANDLER_RESULT_HANDLED;
}
-
if (dbus_message_is_signal(message, LASH_IFACE_CONTROL, "ProjectNameChanged")) {
if (!dbus_message_get_args(
message, &app->dbus()->error(),
@@ -484,7 +483,7 @@ LashProxyImpl::on_project_added(const string& name)
{
LoadedProjectProperties properties;
get_loaded_project_properties(name, properties);
-
+
shared_ptr<Project> project(new Project(name, properties));
_session->project_add(project);
diff --git a/src/LoadProjectDialog.cpp b/src/LoadProjectDialog.cpp
index f886fcd..d19fa04 100644
--- a/src/LoadProjectDialog.cpp
+++ b/src/LoadProjectDialog.cpp
@@ -65,7 +65,6 @@ convert_timestamp_to_string(
}
}
-
LoadProjectDialog::LoadProjectDialog(Patchage* app)
: _app(app)
, _dialog(app->xml(), "load_project_dialog")
@@ -84,7 +83,6 @@ LoadProjectDialog::LoadProjectDialog(Patchage* app)
_widget->append_column("Description", _columns.description);
}
-
void
LoadProjectDialog::run(std::list<ProjectInfo>& projects)
{
@@ -119,7 +117,6 @@ loop:
_dialog->hide();
}
-
void
LoadProjectDialog::load_selected_project()
{
@@ -129,7 +126,6 @@ LoadProjectDialog::load_selected_project()
_dialog->hide();
}
-
bool
LoadProjectDialog::on_button_press_event(GdkEventButton * event_ptr)
{
@@ -140,7 +136,6 @@ LoadProjectDialog::on_button_press_event(GdkEventButton * event_ptr)
return false;
}
-
bool
LoadProjectDialog::on_key_press_event(GdkEventKey * event_ptr)
{
diff --git a/src/Patchage.cpp b/src/Patchage.cpp
index f452bda..dd18a46 100644
--- a/src/Patchage.cpp
+++ b/src/Patchage.cpp
@@ -91,7 +91,6 @@ gtkmm_set_width_for_given_text (Gtk::Widget &w, const gchar *text,
/* end Gtk helpers */
-
#define INIT_WIDGET(x) x(_xml, ((const char*)#x) + 1)
Patchage::Patchage(int argc, char** argv)
@@ -295,7 +294,6 @@ Patchage::Patchage(int argc, char** argv)
sigc::mem_fun(this, &Patchage::idle_callback), 100);
}
-
Patchage::~Patchage()
{
#if defined(PATCHAGE_LIBJACK) || defined(HAVE_JACK_DBUS)
@@ -318,7 +316,6 @@ Patchage::~Patchage()
_xml.reset();
}
-
void
Patchage::attach()
{
@@ -341,7 +338,6 @@ Patchage::attach()
update_toolbar();
}
-
bool
Patchage::idle_callback()
{
@@ -395,7 +391,6 @@ Patchage::idle_callback()
return true;
}
-
void
Patchage::update_toolbar()
{
@@ -408,7 +403,6 @@ Patchage::update_toolbar()
#endif
}
-
bool
Patchage::update_load()
{
@@ -434,7 +428,6 @@ Patchage::update_load()
return true;
}
-
void
Patchage::zoom(double z)
{
@@ -442,7 +435,6 @@ Patchage::zoom(double z)
_canvas->set_zoom(z);
}
-
void
Patchage::refresh()
{
@@ -466,7 +458,6 @@ Patchage::refresh()
}
}
-
/** Update the stored window location and size in the StateManager (in memory).
*/
void
@@ -485,7 +476,6 @@ Patchage::store_window_location()
_state_manager->set_window_size(window_size);
}
-
void
Patchage::clear_load()
{
@@ -496,7 +486,6 @@ Patchage::clear_load()
#endif
}
-
void
Patchage::error_msg(const std::string& msg)
{
@@ -508,7 +497,6 @@ Patchage::error_msg(const std::string& msg)
#endif
}
-
void
Patchage::info_msg(const std::string& msg)
{
@@ -520,7 +508,6 @@ Patchage::info_msg(const std::string& msg)
#endif
}
-
void
Patchage::status_msg(const string& msg)
{
@@ -531,7 +518,6 @@ Patchage::status_msg(const string& msg)
_status_text->scroll_to_mark(_status_text->get_buffer()->get_insert(), 0);
}
-
void
Patchage::update_state()
{
@@ -542,7 +528,6 @@ Patchage::update_state()
}
}
-
/** Update the sensitivity status of menus to reflect the present.
*
* (eg. disable "Connect to Jack" when Patchage is already connected to Jack)
@@ -611,7 +596,6 @@ Patchage::menu_alsa_connect()
_alsa_driver->refresh();
}
-
void
Patchage::menu_alsa_disconnect()
{
@@ -620,7 +604,6 @@ Patchage::menu_alsa_disconnect()
}
#endif
-
void
Patchage::on_arrange()
{
@@ -629,7 +612,6 @@ Patchage::on_arrange()
_canvas->arrange();
}
-
void
Patchage::on_help_about()
{
@@ -637,28 +619,24 @@ Patchage::on_help_about()
_about_win->hide();
}
-
void
Patchage::on_zoom_in()
{
_canvas->set_font_size(_canvas->get_font_size() + 1.0);
}
-
void
Patchage::on_zoom_out()
{
_canvas->set_font_size(_canvas->get_font_size() - 1.0);
}
-
void
Patchage::on_zoom_normal()
{
_canvas->set_zoom_and_font_size(1.0, _canvas->get_default_font_size());
}
-
void
Patchage::on_messages_clear()
{
@@ -667,14 +645,12 @@ Patchage::on_messages_clear()
_status_text->get_buffer()->end());
}
-
void
Patchage::on_messages_close()
{
_menu_view_messages->set_active(false);
}
-
bool
Patchage::on_messages_delete(GdkEventAny*)
{
@@ -682,7 +658,6 @@ Patchage::on_messages_delete(GdkEventAny*)
return true;
}
-
void
Patchage::on_quit()
{
@@ -696,7 +671,6 @@ Patchage::on_quit()
_canvas.reset();
}
-
void
Patchage::on_show_messages()
{
@@ -706,7 +680,6 @@ Patchage::on_show_messages()
_messages_win->hide();
}
-
void
Patchage::on_show_projects()
{
@@ -716,7 +689,6 @@ Patchage::on_show_projects()
_project_list_viewport->hide();
}
-
void
Patchage::on_store_positions()
{
@@ -724,7 +696,6 @@ Patchage::on_store_positions()
_state_manager->save(_settings_filename);
}
-
void
Patchage::on_view_toolbar()
{
@@ -734,14 +705,12 @@ Patchage::on_view_toolbar()
_toolbar->hide();
}
-
bool
Patchage::on_scroll(GdkEventScroll* ev)
{
return false;
}
-
void
Patchage::buffer_size_changed()
{
@@ -759,7 +728,6 @@ Patchage::buffer_size_changed()
#endif
}
-
void
Patchage::enqueue_resize(boost::shared_ptr<FlowCanvas::Module> module)
{
@@ -767,7 +735,6 @@ Patchage::enqueue_resize(boost::shared_ptr<FlowCanvas::Module> module)
_pending_resize.insert(module);
}
-
void
Patchage::flush_resize()
{
diff --git a/src/PatchageCanvas.cpp b/src/PatchageCanvas.cpp
index ae994e9..9a8854a 100644
--- a/src/PatchageCanvas.cpp
+++ b/src/PatchageCanvas.cpp
@@ -42,7 +42,6 @@ PatchageCanvas::PatchageCanvas(Patchage* app, int width, int height)
{
}
-
boost::shared_ptr<PatchageModule>
PatchageCanvas::find_module(const string& name, ModuleType type)
{
@@ -63,7 +62,6 @@ PatchageCanvas::find_module(const string& name, ModuleType type)
return io_module;
}
-
boost::shared_ptr<PatchagePort>
PatchageCanvas::find_port(const PortID& id)
{
@@ -135,7 +133,6 @@ PatchageCanvas::find_port_by_name(const std::string& client_name,
return boost::shared_ptr<PatchagePort>();
}
-
void
PatchageCanvas::connect(boost::shared_ptr<FlowCanvas::Connectable> port1,
boost::shared_ptr<FlowCanvas::Connectable> port2)
@@ -159,7 +156,6 @@ PatchageCanvas::connect(boost::shared_ptr<FlowCanvas::Connectable> port1,
}
}
-
void
PatchageCanvas::disconnect(boost::shared_ptr<FlowCanvas::Connectable> port1,
boost::shared_ptr<FlowCanvas::Connectable> port2)
@@ -196,14 +192,12 @@ PatchageCanvas::disconnect(boost::shared_ptr<FlowCanvas::Connectable> port1,
}
}
-
void
PatchageCanvas::status_message(const string& msg)
{
_app->status_msg(string("[Canvas] ").append(msg));
}
-
void
PatchageCanvas::add_module(const std::string& name, boost::shared_ptr<PatchageModule> module)
{
@@ -221,11 +215,10 @@ PatchageCanvas::add_module(const std::string& name, boost::shared_ptr<PatchageMo
}
if (in_module && out_module)
out_module->set_partner(in_module);
-
+
add_item(module);
}
-
bool
PatchageCanvas::remove_item(boost::shared_ptr<FlowCanvas::Item> i)
{
@@ -250,7 +243,6 @@ PatchageCanvas::remove_item(boost::shared_ptr<FlowCanvas::Item> i)
return ret;
}
-
void
PatchageCanvas::destroy()
{
diff --git a/src/PatchageCanvas.hpp b/src/PatchageCanvas.hpp
index e891cd3..4c729a1 100644
--- a/src/PatchageCanvas.hpp
+++ b/src/PatchageCanvas.hpp
@@ -44,13 +44,13 @@ public:
boost::shared_ptr<PatchageModule> find_module(const std::string& name, ModuleType type);
boost::shared_ptr<PatchagePort> find_port(const PortID& id);
-
+
boost::shared_ptr<PatchagePort> find_port_by_name(const std::string& client_name,
const std::string& port_name);
void connect(boost::shared_ptr<FlowCanvas::Connectable> port1,
boost::shared_ptr<FlowCanvas::Connectable> port2);
-
+
void disconnect(boost::shared_ptr<FlowCanvas::Connectable> port1,
boost::shared_ptr<FlowCanvas::Connectable> port2);
@@ -77,5 +77,4 @@ private:
ModuleIndex _module_index;
};
-
#endif // PATCHAGE_PATCHAGECANVAS_HPP
diff --git a/src/PatchageEvent.hpp b/src/PatchageEvent.hpp
index 3a4135d..35efb5f 100644
--- a/src/PatchageEvent.hpp
+++ b/src/PatchageEvent.hpp
@@ -85,6 +85,5 @@ private:
uint8_t _type;
};
-
#endif // PATCHAGE_PATCHAGEEVENT_HPP
diff --git a/src/PatchageModule.hpp b/src/PatchageModule.hpp
index 734ff0f..450104a 100644
--- a/src/PatchageModule.hpp
+++ b/src/PatchageModule.hpp
@@ -53,5 +53,4 @@ protected:
ModuleType _type;
};
-
#endif // PATCHAGE_PATCHAGEMODULE_HPP
diff --git a/src/PatchagePort.hpp b/src/PatchagePort.hpp
index c343d58..b1a96e7 100644
--- a/src/PatchagePort.hpp
+++ b/src/PatchagePort.hpp
@@ -73,5 +73,4 @@ private:
PortType _type;
};
-
#endif // PATCHAGE_PATCHAGEPORT_HPP
diff --git a/src/ProjectPropertiesDialog.cpp b/src/ProjectPropertiesDialog.cpp
index 1bdf02a..4753b69 100644
--- a/src/ProjectPropertiesDialog.cpp
+++ b/src/ProjectPropertiesDialog.cpp
@@ -36,19 +36,16 @@ struct ProjectPropertiesDialogImpl {
Widget<Gtk::TextView> _notes;
};
-
ProjectPropertiesDialog::ProjectPropertiesDialog(LashProxy* proxy, Glib::RefPtr<Gnome::Glade::Xml> xml)
{
_impl = new ProjectPropertiesDialogImpl(proxy, xml);
}
-
ProjectPropertiesDialog::~ProjectPropertiesDialog()
{
delete _impl;
}
-
void
ProjectPropertiesDialog::run(shared_ptr<Project> project)
{
@@ -79,7 +76,6 @@ ProjectPropertiesDialog::run(shared_ptr<Project> project)
_impl->_dialog->hide();
}
-
ProjectPropertiesDialogImpl::ProjectPropertiesDialogImpl(
LashProxy* proxy,
Glib::RefPtr<Gnome::Glade::Xml> xml)
diff --git a/src/StateManager.cpp b/src/StateManager.cpp
index 544725a..f18187d 100644
--- a/src/StateManager.cpp
+++ b/src/StateManager.cpp
@@ -36,7 +36,6 @@ StateManager::StateManager()
{
}
-
bool
StateManager::get_module_location(const string& name, ModuleType type, Coord& loc)
{
@@ -72,7 +71,6 @@ StateManager::get_module_location(const string& name, ModuleType type, Coord& lo
return false;
}
-
void
StateManager::set_module_location(const string& name, ModuleType type, Coord loc)
{
@@ -101,7 +99,6 @@ retry:
}
}
-
/** Returns whether or not this module should be split.
*
* If nothing is known about the given module, @a default_val is returned (this is
@@ -117,14 +114,12 @@ StateManager::get_module_split(const string& name, bool default_val) const
return (*i).second.split;
}
-
void
StateManager::set_module_split(const string& name, bool split)
{
_module_settings[name].split = split;
}
-
void
StateManager::load(const string& filename)
{
@@ -135,7 +130,7 @@ StateManager::load(const string& filename)
if ( ! is.good())
return;
-
+
Raul::info << "Loading configuration file " << filename << endl;
string s;
@@ -228,7 +223,6 @@ StateManager::save(const string& filename)
os << "window_size " << _window_size.x << " " << _window_size.y << std::endl;
os << "zoom_level " << _zoom << std::endl;
-
for (map<string, ModuleSettings>::iterator i = _module_settings.begin();
i != _module_settings.end(); ++i) {
const ModuleSettings& settings = (*i).second;
@@ -249,21 +243,18 @@ StateManager::save(const string& filename)
os.close();
}
-
float
StateManager::get_zoom()
{
return _zoom;
}
-
void
StateManager::set_zoom(float zoom)
{
_zoom = zoom;
}
-
int
StateManager::get_port_color(PortType type)
{
diff --git a/src/StateManager.hpp b/src/StateManager.hpp
index e2c85c3..796b39b 100644
--- a/src/StateManager.hpp
+++ b/src/StateManager.hpp
@@ -73,5 +73,4 @@ private:
float _zoom;
};
-
#endif // PATCHAGE_STATEMANAGER_HPP
diff --git a/src/Widget.hpp b/src/Widget.hpp
index 055517c..0a5f932 100644
--- a/src/Widget.hpp
+++ b/src/Widget.hpp
@@ -43,5 +43,4 @@ private:
W* _me;
};
-
#endif // PATCHAGE_WIDGET_HPP
diff --git a/src/main.cpp b/src/main.cpp
index abf13c9..4be53a8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -15,7 +15,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#ifdef __APPLE__
+#ifdef __APPLE__
#include <stdlib.h>
#include <unistd.h>
#include <string>
@@ -49,13 +49,13 @@ set_bundle_environment()
chdir(bundle_path.c_str());
const std::string pangorc_path(bundle_path + "/Resources/pangorc");
setenv("PANGO_RC_FILE", pangorc_path.c_str(), 1);
-
+
const char* path_c = getenv("PATH");
std::string path = "/opt/local/bin";
if (path_c)
path += std::string(":") + path_c;
setenv("PATH", path.c_str(), 1);
-
+
gtk_rc_parse((bundle_path + "/Resources/gtkrc").c_str());
}
#endif
@@ -76,7 +76,7 @@ main(int argc, char** argv)
Patchage patchage(argc, argv);
app.run(*patchage.window());
-
+
} catch (std::exception& e) {
Raul::error << "patchage: error: " << e.what() << std::endl;
return 1;
@@ -88,4 +88,3 @@ main(int argc, char** argv)
return 0;
}
-