From e1a63732f796c8057751cb7f8ac98a595b91692e Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 12 Jan 2013 03:17:47 +0000 Subject: Bulk reformat. git-svn-id: http://svn.drobilla.net/lad/trunk/machina@4929 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/EdgeView.cpp | 39 ++++++++++++++++++++------------------ src/gui/EdgeView.hpp | 3 ++- src/gui/MachinaCanvas.cpp | 39 ++++++++++++++++++++++---------------- src/gui/MachinaCanvas.hpp | 11 ++++++++--- src/gui/MachinaGUI.cpp | 41 +++++++++++++++++++++++++--------------- src/gui/MachinaGUI.hpp | 8 ++++++-- src/gui/NodePropertiesWindow.cpp | 31 +++++++++++++++--------------- src/gui/NodePropertiesWindow.hpp | 13 +++++++++---- src/gui/NodeView.cpp | 12 ++++++++---- src/gui/NodeView.hpp | 3 ++- src/gui/WidgetFactory.hpp | 15 ++++++++------- src/gui/main.cpp | 15 ++++++++------- 12 files changed, 137 insertions(+), 93 deletions(-) (limited to 'src/gui') diff --git a/src/gui/EdgeView.cpp b/src/gui/EdgeView.cpp index 1853b08..afa8cfd 100644 --- a/src/gui/EdgeView.cpp +++ b/src/gui/EdgeView.cpp @@ -29,22 +29,22 @@ using Machina::URIs; /* probability colour stuff */ -#define RGB_TO_UINT(r,g,b) ((((guint)(r))<<16)|(((guint)(g))<<8)|((guint)(b))) -#define RGB_TO_RGBA(x,a) (((x) << 8) | ((((guint)a) & 0xff))) -#define RGBA_TO_UINT(r,g,b,a) RGB_TO_RGBA(RGB_TO_UINT(r,g,b), a) +#define RGB_TO_UINT(r, g, b) ((((guint)(r)) << 16) | (((guint)(g)) << 8) | ((guint)(b))) +#define RGB_TO_RGBA(x, a) (((x) << 8) | ((((guint)a) & 0xff))) +#define RGBA_TO_UINT(r, g, b, a) RGB_TO_RGBA(RGB_TO_UINT(r, g, b), a) -#define UINT_RGBA_R(x) (((uint32_t)(x))>>24) -#define UINT_RGBA_G(x) ((((uint32_t)(x))>>16)&0xff) -#define UINT_RGBA_B(x) ((((uint32_t)(x))>>8)&0xff) -#define UINT_RGBA_A(x) (((uint32_t)(x))&0xff) +#define UINT_RGBA_R(x) (((uint32_t)(x)) >> 24) +#define UINT_RGBA_G(x) ((((uint32_t)(x)) >> 16) & 0xff) +#define UINT_RGBA_B(x) ((((uint32_t)(x)) >> 8) & 0xff) +#define UINT_RGBA_A(x) (((uint32_t)(x)) & 0xff) -#define MONO_INTERPOLATE(v1, v2, t) ((int)rint((v2)*(t)+(v1)*(1-(t)))) +#define MONO_INTERPOLATE(v1, v2, t) ((int)rint((v2) * (t) + (v1) * (1 - (t)))) #define UINT_INTERPOLATE(c1, c2, t) \ - RGBA_TO_UINT( MONO_INTERPOLATE(UINT_RGBA_R(c1), UINT_RGBA_R(c2), t), \ - MONO_INTERPOLATE(UINT_RGBA_G(c1), UINT_RGBA_G(c2), t), \ - MONO_INTERPOLATE(UINT_RGBA_B(c1), UINT_RGBA_B(c2), t), \ - MONO_INTERPOLATE(UINT_RGBA_A(c1), UINT_RGBA_A(c2), t) ) + RGBA_TO_UINT(MONO_INTERPOLATE(UINT_RGBA_R(c1), UINT_RGBA_R(c2), t), \ + MONO_INTERPOLATE(UINT_RGBA_G(c1), UINT_RGBA_G(c2), t), \ + MONO_INTERPOLATE(UINT_RGBA_B(c1), UINT_RGBA_B(c2), t), \ + MONO_INTERPOLATE(UINT_RGBA_A(c1), UINT_RGBA_A(c2), t) ) inline static uint32_t edge_color(float prob) { @@ -52,10 +52,11 @@ inline static uint32_t edge_color(float prob) static const uint32_t mid = 0xFFFF44C0; static const uint32_t max = 0x44FF44C0; - if (prob <= 0.5) - return UINT_INTERPOLATE(min, mid, prob*2.0); - else - return UINT_INTERPOLATE(mid, max, (prob-0.5)*2.0); + if (prob <= 0.5) { + return UINT_INTERPOLATE(min, mid, prob * 2.0); + } else { + return UINT_INTERPOLATE(mid, max, (prob - 0.5) * 2.0); + } } /* end probability colour stuff */ @@ -88,7 +89,8 @@ double EdgeView::length_hint() const { NodeView* tail = dynamic_cast(get_tail()); - return tail->node()->get(URIs::instance().machina_duration).get_float() * 10.0; + return tail->node()->get(URIs::instance().machina_duration).get_float() + * 10.0; } void @@ -126,6 +128,7 @@ EdgeView::on_event(GdkEvent* ev) void EdgeView::on_property(Machina::URIInt key, const Raul::Atom& value) { - if (key == URIs::instance().machina_probability) + if (key == URIs::instance().machina_probability) { set_color(edge_color(value.get_float())); + } } diff --git a/src/gui/EdgeView.hpp b/src/gui/EdgeView.hpp index bb9b478..b532071 100644 --- a/src/gui/EdgeView.hpp +++ b/src/gui/EdgeView.hpp @@ -28,7 +28,8 @@ class NodeView; class EdgeView : public Ganv::Edge - , public Machina::Client::ClientObject::View { + , public Machina::Client::ClientObject::View +{ public: EdgeView(Ganv::Canvas& canvas, SharedPtr src, diff --git a/src/gui/MachinaCanvas.cpp b/src/gui/MachinaCanvas.cpp index a2bb2ac..3d01012 100644 --- a/src/gui/MachinaCanvas.cpp +++ b/src/gui/MachinaCanvas.cpp @@ -41,32 +41,37 @@ MachinaCanvas::MachinaCanvas(MachinaGUI* app, int width, int height) widget().grab_focus(); signal_event.connect( - sigc::mem_fun(this, &MachinaCanvas::on_event)); + sigc::mem_fun(this, &MachinaCanvas::on_event)); } bool MachinaCanvas::node_clicked(WeakPtr item, GdkEventButton* event) { SharedPtr node = PtrCast(item.lock()); - if (!node) + if (!node) { return false; + } - if (event->state & GDK_CONTROL_MASK) + if (event->state & GDK_CONTROL_MASK) { return false; + } - if (event->button == 2) { // Middle click: learn + if (event->button == 2) { + // Middle click: learn _app->controller()->learn(_app->maid(), node->node()->id()); return false; - } else if (event->button == 1) { // Left click: connect/disconnect + } else if (event->button == 1) { + // Left click: connect/disconnect SharedPtr last = _last_clicked.lock(); if (last) { if (node != last) { - if (get_edge(last.get(), node.get())) + if (get_edge(last.get(), node.get())) { action_disconnect(last, node); - else + } else { action_connect(last, node); + } } last->set_default_colors(); @@ -85,9 +90,9 @@ MachinaCanvas::node_clicked(WeakPtr item, GdkEventButton* event) bool MachinaCanvas::on_event(GdkEvent* event) { - if (event->type == GDK_BUTTON_RELEASE - && event->button.button == 3 - && !(event->button.state & (GDK_CONTROL_MASK))) { + if (( event->type == GDK_BUTTON_RELEASE) + && ( event->button.button == 3) + && !(event->button.state & (GDK_CONTROL_MASK))) { action_create_node(event->button.x, event->button.y); return true; @@ -110,16 +115,18 @@ MachinaCanvas::on_new_object(SharedPtr object) // view->set_base_color(0x101010FF); view->signal_clicked().connect( - sigc::bind<0>(sigc::mem_fun(this, &MachinaCanvas::node_clicked), - WeakPtr(view))); + sigc::bind<0>(sigc::mem_fun(this, &MachinaCanvas::node_clicked), + WeakPtr(view))); object->set_view(view); } else if (type.get() == uris.machina_Edge) { - SharedPtr tail = _app->client_model()->find( - object->get(uris.machina_tail_id).get_int32()); - SharedPtr head = _app->client_model()->find( - object->get(uris.machina_head_id).get_int32()); + SharedPtr tail + = _app->client_model()->find( + object->get(uris.machina_tail_id).get_int32()); + SharedPtr head + = _app->client_model()->find( + object->get(uris.machina_head_id).get_int32()); if (!tail || !head) { std::cerr << "Invalid arc" << std::endl; diff --git a/src/gui/MachinaCanvas.hpp b/src/gui/MachinaCanvas.hpp index 7a80d33..4f190fd 100644 --- a/src/gui/MachinaCanvas.hpp +++ b/src/gui/MachinaCanvas.hpp @@ -28,9 +28,14 @@ using namespace Ganv; class MachinaGUI; class NodeView; -namespace Machina { namespace Client { class ClientObject; } } - -class MachinaCanvas : public Canvas +namespace Machina { +namespace Client { +class ClientObject; +} +} + +class MachinaCanvas + : public Canvas { public: MachinaCanvas(MachinaGUI* app, int width, int height); diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp index 1a92d40..6e3b188 100644 --- a/src/gui/MachinaGUI.cpp +++ b/src/gui/MachinaGUI.cpp @@ -49,7 +49,8 @@ MachinaGUI::MachinaGUI(SharedPtr engine) , _controller(new Machina::Controller(_engine, *_client_model.get())) , _maid(new Raul::Maid()) { - _canvas = boost::shared_ptr(new MachinaCanvas(this, 1600*2, 1200*2)); + _canvas = boost::shared_ptr( + new MachinaCanvas(this, 1600*2, 1200*2)); Glib::RefPtr xml = WidgetFactory::create(); @@ -96,15 +97,16 @@ MachinaGUI::MachinaGUI(SharedPtr engine) _canvas_scrolledwindow->add(_canvas->widget()); _canvas_scrolledwindow->signal_event().connect(sigc::mem_fun(this, &MachinaGUI::scrolled_window_event)); - _canvas->scroll_to(static_cast(_canvas->get_width()/2.0 - 320), - static_cast(_canvas->get_height()/2.0 - 240)); // FIXME: hardcoded _canvas_scrolledwindow->property_hadjustment().get_value()->set_step_increment(10); _canvas_scrolledwindow->property_vadjustment().get_value()->set_step_increment(10); - _record_button->signal_toggled().connect(sigc::mem_fun(this, &MachinaGUI::record_toggled)); - _stop_button->signal_clicked().connect(sigc::mem_fun(this, &MachinaGUI::stop_clicked)); - _play_button->signal_toggled().connect(sigc::mem_fun(this, &MachinaGUI::play_toggled)); + _record_button->signal_toggled().connect( + sigc::mem_fun(this, &MachinaGUI::record_toggled)); + _stop_button->signal_clicked().connect( + sigc::mem_fun(this, &MachinaGUI::stop_clicked)); + _play_button->signal_toggled().connect( + sigc::mem_fun(this, &MachinaGUI::play_toggled)); _zoom_normal_button->signal_clicked().connect(sigc::bind( sigc::mem_fun(this, &MachinaGUI::zoom), 1.0)); @@ -145,7 +147,8 @@ MachinaGUI::MachinaGUI(SharedPtr engine) sigc::mem_fun(this, &MachinaGUI::quantize_changed)); _mutate_button->signal_clicked().connect(sigc::bind( - sigc::mem_fun(this, &MachinaGUI::random_mutation), SharedPtr())); + sigc::mem_fun(this, &MachinaGUI::random_mutation), + SharedPtr())); _compress_button->signal_clicked().connect(sigc::hide_return(sigc::bind( sigc::mem_fun(this, &MachinaGUI::mutate), SharedPtr(), 0))); _add_node_button->signal_clicked().connect(sigc::bind( @@ -180,12 +183,16 @@ MachinaGUI::MachinaGUI(SharedPtr engine) 1000); // Idle callback to update node states - Glib::signal_timeout().connect(sigc::mem_fun(this, &MachinaGUI::idle_callback), 100); + Glib::signal_timeout().connect( + sigc::mem_fun(this, &MachinaGUI::idle_callback), 100); #ifdef HAVE_EUGENE - _load_target_button->signal_clicked().connect(sigc::mem_fun(this, &MachinaGUI::load_target_clicked)); - _evolve_button->signal_clicked().connect(sigc::mem_fun(this, &MachinaGUI::evolve_toggled)); - Glib::signal_timeout().connect(sigc::mem_fun(this, &MachinaGUI::evolve_callback), 1000); + _load_target_button->signal_clicked().connect( + sigc::mem_fun(this, &MachinaGUI::load_target_clicked)); + _evolve_button->signal_clicked().connect( + sigc::mem_fun(this, &MachinaGUI::evolve_toggled)); + Glib::signal_timeout().connect( + sigc::mem_fun(this, &MachinaGUI::evolve_callback), 1000); #else _evolve_toolbar->set_sensitive(false); #endif @@ -193,8 +200,10 @@ MachinaGUI::MachinaGUI(SharedPtr engine) _controller->announce(engine->machine()); _canvas->arrange(); - _client_model->signal_new_object.connect(sigc::mem_fun(this, &MachinaGUI::on_new_object)); - _client_model->signal_erase_object.connect(sigc::mem_fun(this, &MachinaGUI::on_erase_object)); + _client_model->signal_new_object.connect( + sigc::mem_fun(this, &MachinaGUI::on_new_object)); + _client_model->signal_erase_object.connect( + sigc::mem_fun(this, &MachinaGUI::on_erase_object)); } MachinaGUI::~MachinaGUI() @@ -280,7 +289,8 @@ void MachinaGUI::evolve_toggled() { if (_evolve_button->get_active()) { - _evolver = SharedPtr(new Evolver(_unit, _target_filename, _engine->machine())); + _evolver = SharedPtr( + new Evolver(_unit, _target_filename, _engine->machine())); _evolve = true; stop_clicked(); _engine->driver()->set_machine(SharedPtr()); @@ -288,7 +298,8 @@ MachinaGUI::evolve_toggled() } else { _evolver->stop(); _evolve = false; - SharedPtr new_machine = SharedPtr(new Machine(*_evolver->best())); + SharedPtr new_machine = SharedPtr( + new Machine(*_evolver->best())); _engine->driver()->set_machine(new_machine); _canvas->build(new_machine, _menu_view_labels->get_active()); new_machine->activate(); diff --git a/src/gui/MachinaGUI.hpp b/src/gui/MachinaGUI.hpp index 27133e0..c48ac93 100644 --- a/src/gui/MachinaGUI.hpp +++ b/src/gui/MachinaGUI.hpp @@ -35,7 +35,9 @@ class Machine; class Engine; class Evolver; class Controller; -namespace Client { class ClientModel; class ClientObject; } +namespace Client { +class ClientModel; class ClientObject; +} } class MachinaCanvas; @@ -65,7 +67,9 @@ public: void on_new_object(SharedPtr object); void on_erase_object(SharedPtr object); - SharedPtr client_model() { return _client_model; } + SharedPtr client_model() { + return _client_model; + } protected: void connect_widgets(); diff --git a/src/gui/NodePropertiesWindow.cpp b/src/gui/NodePropertiesWindow.cpp index 90e1269..52ad5af 100644 --- a/src/gui/NodePropertiesWindow.cpp +++ b/src/gui/NodePropertiesWindow.cpp @@ -24,8 +24,9 @@ using namespace Machina; NodePropertiesWindow* NodePropertiesWindow::_instance = NULL; -NodePropertiesWindow::NodePropertiesWindow(BaseObjectType* cobject, - const Glib::RefPtr& xml) +NodePropertiesWindow::NodePropertiesWindow( + BaseObjectType* cobject, + const Glib::RefPtr& xml) : Gtk::Dialog(cobject) { property_visible() = false; @@ -45,13 +46,12 @@ NodePropertiesWindow::NodePropertiesWindow(BaseObjectType* cob } NodePropertiesWindow::~NodePropertiesWindow() -{ -} +{} void NodePropertiesWindow::apply_clicked() { - #if 0 +#if 0 const uint8_t note = _note_spinbutton->get_value(); if (!_node->enter_action()) { _node->set_enter_action(ActionFactory::note_on(note)); @@ -59,15 +59,15 @@ NodePropertiesWindow::apply_clicked() } else { SharedPtr action = PtrCast(_node->enter_action()); action->event()[1] = note; - action = PtrCast(_node->exit_action()); + action = PtrCast(_node->exit_action()); action->event()[1] = note; } const double duration_dbl = _duration_spinbutton->get_value(); - TimeStamp duration(TimeUnit(TimeUnit::BEATS, 19200), duration_dbl); + TimeStamp duration(TimeUnit(TimeUnit::BEATS, 19200), duration_dbl); _node->set_duration(duration); _node->set_changed(); - #endif +#endif } void @@ -89,10 +89,10 @@ void NodePropertiesWindow::set_node(SharedPtr node) { _node = node; - #if 0 +#if 0 SharedPtr enter_action = PtrCast(node->enter_action()); - if (enter_action && enter_action->event_size() > 1 - && (enter_action->event()[0] & 0xF0) == 0x90) { + if (enter_action && ( enter_action->event_size() > 1) + && ( (enter_action->event()[0] & 0xF0) == 0x90) ) { _note_spinbutton->set_value(enter_action->event()[1]); _note_spinbutton->show(); } else if (!enter_action) { @@ -102,22 +102,23 @@ NodePropertiesWindow::set_node(SharedPtr node) _note_spinbutton->hide(); } _duration_spinbutton->set_value(node->duration().to_double()); - #endif +#endif } void -NodePropertiesWindow::present(Gtk::Window* parent, SharedPtr node) +NodePropertiesWindow::present(Gtk::Window* parent, + SharedPtr node) { if (!_instance) { Glib::RefPtr xml = WidgetFactory::create(); xml->get_widget_derived("node_properties_dialog", _instance); - if (parent) + if (parent) { _instance->set_transient_for(*parent); + } } _instance->set_node(node); _instance->show(); } - diff --git a/src/gui/NodePropertiesWindow.hpp b/src/gui/NodePropertiesWindow.hpp index 2b61d03..7d395c9 100644 --- a/src/gui/NodePropertiesWindow.hpp +++ b/src/gui/NodePropertiesWindow.hpp @@ -22,12 +22,17 @@ #include "raul/SharedPtr.hpp" -namespace Machina { namespace Client { class ClientObject; } } - -class NodePropertiesWindow : public Gtk::Dialog +namespace Machina { +namespace Client { +class ClientObject; +} +} + +class NodePropertiesWindow + : public Gtk::Dialog { public: - NodePropertiesWindow(BaseObjectType* cobject, + NodePropertiesWindow(BaseObjectType* cobject, const Glib::RefPtr& xml); ~NodePropertiesWindow(); diff --git a/src/gui/NodeView.cpp b/src/gui/NodeView.cpp index d388921..c1eeff0 100644 --- a/src/gui/NodeView.cpp +++ b/src/gui/NodeView.cpp @@ -78,7 +78,8 @@ NodeView::on_event(GdkEvent* event) canvas->app()->controller()->set_property( _node->id(), URIs::instance().machina_selector, - forge.make(!node_is(forge, URIs::instance().machina_selector))); + forge.make(!node_is(forge, + URIs::instance().machina_selector))); return true; } } else { @@ -93,7 +94,9 @@ NodeView::on_event(GdkEvent* event) static std::string midi_note_name(uint8_t num) { - static const char* notes[] = {"C","C#","D","D#","E","F","F#","G","G#","A","A#","B"}; + static const char* notes[] = { + "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B" + }; const uint8_t octave = num / 12; num -= octave * 12; @@ -107,7 +110,8 @@ void NodeView::show_label(bool show) { if (show && _enter_action) { - Raul::Atom note_number = _enter_action->get(URIs::instance().machina_note_number); + Raul::Atom note_number = _enter_action->get( + URIs::instance().machina_note_number); if (note_number.is_valid()) { set_label(midi_note_name(note_number.get_int32()).c_str()); return; @@ -148,7 +152,7 @@ NodeView::on_property(Machina::URIInt key, const Raul::Atom& value) } } else if (key == URIs::instance().machina_enter_action) { const uint64_t action_id = value.get_int32(); - MachinaCanvas* canvas = dynamic_cast(this->canvas()); + MachinaCanvas* canvas = dynamic_cast(this->canvas()); _enter_action_connection.disconnect(); _enter_action = canvas->app()->client_model()->find(action_id); if (_enter_action) { diff --git a/src/gui/NodeView.hpp b/src/gui/NodeView.hpp index 61e4838..5359b4b 100644 --- a/src/gui/NodeView.hpp +++ b/src/gui/NodeView.hpp @@ -26,7 +26,8 @@ class NodeView : public Ganv::Circle - , public Machina::Client::ClientObject::View { + , public Machina::Client::ClientObject::View +{ public: NodeView(Gtk::Window* window, Canvas& canvas, diff --git a/src/gui/WidgetFactory.hpp b/src/gui/WidgetFactory.hpp index 6d706dd..41e8200 100644 --- a/src/gui/WidgetFactory.hpp +++ b/src/gui/WidgetFactory.hpp @@ -30,17 +30,18 @@ public: Glib::RefPtr xml; // Check for the .ui file in current directory - std::string ui_filename = "./machina.ui"; + std::string ui_filename = "./machina.ui"; std::ifstream fs(ui_filename.c_str()); - if (fs.fail()) { // didn't find it, check MACHINA_DATA_DIR + if (fs.fail()) { + // didn't find it, check MACHINA_DATA_DIR fs.clear(); - ui_filename = MACHINA_DATA_DIR; + ui_filename = MACHINA_DATA_DIR; ui_filename += "/machina.ui"; fs.open(ui_filename.c_str()); if (fs.fail()) { - std::cerr << "Unable to find machina.ui in current directory or " - << MACHINA_DATA_DIR << "." << std::endl; + std::cerr << "No machina.ui in current directory or " + << MACHINA_DATA_DIR << "." << std::endl; exit(EXIT_FAILURE); } fs.close(); @@ -48,12 +49,12 @@ public: try { xml = Gtk::Builder::create_from_file(ui_filename); - } catch(const Gtk::BuilderError& ex) { + } catch (const Gtk::BuilderError& ex) { std::cerr << ex.what() << std::endl; throw ex; } return xml; } -}; +}; diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 7a70250..e87e29d 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -32,8 +32,9 @@ using namespace Machina; int main(int argc, char** argv) { - if ( ! Glib::thread_supported()) + if (!Glib::thread_supported()) { Glib::thread_init(); + } Sord::World rdf_world; @@ -58,7 +59,7 @@ main(int argc, char** argv) } if (!machine) { - cout << "Not a MIDI file. Attempting to load as Machina file." << endl; + cout << "Not MIDI, attempting to load machine" << endl; machine = Loader(rdf_world).load(filename); } } @@ -66,14 +67,15 @@ main(int argc, char** argv) Raul::Forge forge; - if (!machine) + if (!machine) { machine = SharedPtr( - new Machine(TimeUnit(TimeUnit::BEATS, 19200))); + new Machine(TimeUnit(TimeUnit::BEATS, 19200))); + } std::string driver_name = "smf"; - #ifdef HAVE_JACK + #ifdef HAVE_JACK driver_name = "jack"; - #endif + #endif // Build engine SharedPtr driver(Engine::new_driver(forge, driver_name, machine)); @@ -88,4 +90,3 @@ main(int argc, char** argv) return 0; } - -- cgit v1.2.1