From bf0d5e8785d4fdb258f907cc092fb3670cff020e Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 16 Apr 2011 19:02:36 +0000 Subject: Squeeze blank lines and delete trailing whitespace. git-svn-id: http://svn.drobilla.net/lad/trunk/machina@3152 a436a847-0d15-0410-975c-d299462d15a1 --- src/client/ClientObject.hpp | 2 +- src/engine/Action.cpp | 1 - src/engine/Action.hpp | 3 --- src/engine/ActionFactory.cpp | 3 --- src/engine/ActionFactory.hpp | 2 -- src/engine/Controller.cpp | 10 +++++----- src/engine/Edge.cpp | 3 +-- src/engine/Edge.hpp | 1 - src/engine/Engine.cpp | 4 ---- src/engine/Evolver.cpp | 4 ---- src/engine/JackDriver.cpp | 17 ----------------- src/engine/JackDriver.hpp | 8 +++----- src/engine/LearnRequest.cpp | 2 -- src/engine/LearnRequest.hpp | 2 -- src/engine/Loader.cpp | 3 --- src/engine/Machine.cpp | 15 --------------- src/engine/MachineBuilder.cpp | 11 +---------- src/engine/MachineBuilder.hpp | 2 -- src/engine/MidiAction.cpp | 7 ------- src/engine/MidiAction.hpp | 2 -- src/engine/Mutation.cpp | 9 --------- src/engine/Node.cpp | 16 ---------------- src/engine/Node.hpp | 2 -- src/engine/Problem.cpp | 7 ------- src/engine/Problem.hpp | 2 -- src/engine/Recorder.cpp | 4 ---- src/engine/Recorder.hpp | 2 -- src/engine/SMFDriver.cpp | 6 ------ src/engine/SMFDriver.hpp | 2 -- src/engine/Schrodinbit.hpp | 2 -- src/engine/Stateful.cpp | 1 - src/engine/jack_compat.h | 1 - src/engine/machina/Controller.hpp | 2 +- src/engine/machina/Driver.hpp | 3 +-- src/engine/machina/Engine.hpp | 2 -- src/engine/machina/Evolver.hpp | 2 -- src/engine/machina/Loader.hpp | 2 -- src/engine/machina/Machine.hpp | 1 - src/gui/EdgeView.cpp | 6 ------ src/gui/EdgeView.hpp | 1 - src/gui/MachinaCanvas.hpp | 1 - src/gui/MachinaGUI.cpp | 30 ------------------------------ src/gui/MachinaGUI.hpp | 2 +- src/gui/NodePropertiesWindow.cpp | 10 +--------- src/gui/NodePropertiesWindow.hpp | 1 - src/gui/NodeView.cpp | 4 ++-- src/gui/NodeView.hpp | 1 - src/gui/main.cpp | 2 -- src/machina.cpp | 3 --- src/midi2machina.cpp | 3 --- 50 files changed, 17 insertions(+), 215 deletions(-) (limited to 'src') diff --git a/src/client/ClientObject.hpp b/src/client/ClientObject.hpp index 9b8403c..df9fe32 100644 --- a/src/client/ClientObject.hpp +++ b/src/client/ClientObject.hpp @@ -49,7 +49,7 @@ public: SharedPtr view() const { return _view; } void set_view(SharedPtr view) { _view = view; } - + private: uint64_t _id; SharedPtr _view; diff --git a/src/engine/Action.cpp b/src/engine/Action.cpp index e77ae0e..0307f16 100644 --- a/src/engine/Action.cpp +++ b/src/engine/Action.cpp @@ -31,6 +31,5 @@ Action::write_state(Sord::Model& model) Sord::Curie(model.world(), "machina:Action")); } - } // namespace Machina diff --git a/src/engine/Action.hpp b/src/engine/Action.hpp index c707fd5..addfe59 100644 --- a/src/engine/Action.hpp +++ b/src/engine/Action.hpp @@ -31,7 +31,6 @@ namespace Machina { - /** An Action, executed on entering or exiting of a state. */ struct Action : public Raul::Deletable, public Stateful { @@ -40,7 +39,6 @@ struct Action : public Raul::Deletable, public Stateful { virtual void write_state(Sord::Model& model); }; - class PrintAction : public Action { public: PrintAction(const std::string& msg) : _msg(msg) {} @@ -52,7 +50,6 @@ private: std::string _msg; }; - } // namespace Machina #endif // MACHINA_ACTION_HPP diff --git a/src/engine/ActionFactory.cpp b/src/engine/ActionFactory.cpp index d5fc954..6e8635d 100644 --- a/src/engine/ActionFactory.cpp +++ b/src/engine/ActionFactory.cpp @@ -30,7 +30,6 @@ ActionFactory::copy(SharedPtr copy) return SharedPtr(); } - SharedPtr ActionFactory::note_on(unsigned char note) { @@ -42,7 +41,6 @@ ActionFactory::note_on(unsigned char note) return SharedPtr(new MidiAction(3, buf)); } - SharedPtr ActionFactory::note_off(unsigned char note) { @@ -54,6 +52,5 @@ ActionFactory::note_off(unsigned char note) return SharedPtr(new MidiAction(3, buf)); } - } // namespace Machine diff --git a/src/engine/ActionFactory.hpp b/src/engine/ActionFactory.hpp index 04b0c74..0238341 100644 --- a/src/engine/ActionFactory.hpp +++ b/src/engine/ActionFactory.hpp @@ -24,14 +24,12 @@ namespace Machina { class Action; - namespace ActionFactory { SharedPtr copy(SharedPtr copy); SharedPtr note_on(unsigned char note); SharedPtr note_off(unsigned char note); } - } // namespace Machina #endif // MACHINA_ACTIONFACTORY_HPP diff --git a/src/engine/Controller.cpp b/src/engine/Controller.cpp index 9c39711..bed49ea 100644 --- a/src/engine/Controller.cpp +++ b/src/engine/Controller.cpp @@ -53,7 +53,7 @@ Controller::announce(SharedPtr machine) { for (Machina::Machine::Nodes::const_iterator n = machine->nodes().begin(); n != machine->nodes().end(); ++n) { - + SharedPtr obj(new Machina::Client::ClientObject((*n)->id())); obj->set(URIs::instance().rdf_type, "machina:Node"); obj->set(URIs::instance().machina_duration, Raul::Atom(float((*n)->duration().to_double()))); @@ -69,13 +69,13 @@ Controller::announce(SharedPtr machine) for (Machina::Node::Edges::const_iterator e = (*n)->edges().begin(); e != (*n)->edges().end(); ++e) { _objects.insert(*e); - + SharedPtr eobj(new Client::ClientObject((*e)->id())); eobj->set(URIs::instance().rdf_type, "machina:Edge"); eobj->set(URIs::instance().machina_probability, (*e)->probability()); eobj->set(URIs::instance().machina_tail_id, (int32_t)(*n)->id()); eobj->set(URIs::instance().machina_head_id, (int32_t)(*e)->head()->id()); - + _client_model.new_object(eobj); } } @@ -116,7 +116,7 @@ Controller::connect(uint64_t tail_id, uint64_t head_id) { SharedPtr tail = PtrCast(find(tail_id)); SharedPtr head = PtrCast(find(head_id)); - + SharedPtr edge(new Machina::Edge(tail, head)); tail->add_edge(edge); _objects.insert(edge); @@ -126,7 +126,7 @@ Controller::connect(uint64_t tail_id, uint64_t head_id) obj->set(URIs::instance().machina_probability, 1.0f); obj->set(URIs::instance().machina_tail_id, (int32_t)tail->id()); obj->set(URIs::instance().machina_head_id, (int32_t)head->id()); - + _client_model.new_object(obj); return edge->id(); diff --git a/src/engine/Edge.cpp b/src/engine/Edge.cpp index 00faaa9..78a545b 100644 --- a/src/engine/Edge.cpp +++ b/src/engine/Edge.cpp @@ -37,7 +37,7 @@ Edge::write_state(Sord::Model& model) using namespace Raul; const Sord::Node& rdf_id = this->rdf_id(model.world()); - + model.add_statement( rdf_id, Sord::Curie(model.world(), "rdf:type"), @@ -66,5 +66,4 @@ Edge::write_state(Sord::Model& model) AtomRDF::atom_to_node(model, Atom(_probability.get()))); } - } // namespace Machina diff --git a/src/engine/Edge.hpp b/src/engine/Edge.hpp index 999fa2f..c9994f8 100644 --- a/src/engine/Edge.hpp +++ b/src/engine/Edge.hpp @@ -61,7 +61,6 @@ private: SharedPtr _head; }; - } // namespace Machina #endif // MACHINA_EDGE_HPP diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp index 02533d9..4f1cfd2 100644 --- a/src/engine/Engine.cpp +++ b/src/engine/Engine.cpp @@ -35,7 +35,6 @@ Engine::Engine(SharedPtr driver, Sord::World& rdf_world) { } - SharedPtr Engine::new_driver(const std::string& name, SharedPtr machine) { @@ -128,14 +127,11 @@ Engine::set_bpm(double bpm) _driver->set_bpm(bpm); } - void Engine::set_quantization(double q) { _driver->set_quantization(q); } - } // namespace Machina - diff --git a/src/engine/Evolver.cpp b/src/engine/Evolver.cpp index 9164cbc..3811752 100644 --- a/src/engine/Evolver.cpp +++ b/src/engine/Evolver.cpp @@ -32,7 +32,6 @@ using namespace boost; namespace Machina { - Evolver::Evolver(TimeUnit unit, const string& target_midi, SharedPtr seed) : _problem(new Problem(unit, target_midi, seed)) , _seed_fitness(-FLT_MAX) @@ -62,7 +61,6 @@ Evolver::Evolver(TimeUnit unit, const string& target_midi, SharedPtr se 20, 20, 2, 1.0, 0.0)); } - void Evolver::seed(SharedPtr parent) { @@ -72,7 +70,6 @@ Evolver::seed(SharedPtr parent) _seed_fitness = _problem->fitness(*parent.get()); } - void Evolver::_run() { @@ -106,6 +103,5 @@ Evolver::_run() } } - } // namespace Machina diff --git a/src/engine/JackDriver.cpp b/src/engine/JackDriver.cpp index 018dd59..e05450e 100644 --- a/src/engine/JackDriver.cpp +++ b/src/engine/JackDriver.cpp @@ -32,7 +32,6 @@ using namespace std; namespace Machina { - JackDriver::JackDriver(SharedPtr machine) : Driver(machine) , _client(NULL) @@ -52,13 +51,11 @@ JackDriver::JackDriver(SharedPtr machine) { } - JackDriver::~JackDriver() { detach(); } - void JackDriver::attach(const std::string& client_name) { @@ -106,7 +103,6 @@ JackDriver::attach(const std::string& client_name) } } - void JackDriver::detach() { @@ -130,7 +126,6 @@ JackDriver::detach() } } - void JackDriver::activate() { @@ -141,7 +136,6 @@ JackDriver::activate() } } - void JackDriver::deactivate() { @@ -151,7 +145,6 @@ JackDriver::deactivate() _is_activated = false; } - void JackDriver::set_machine(SharedPtr machine) { @@ -168,7 +161,6 @@ JackDriver::set_machine(SharedPtr machine) last_machine.reset(); } - void JackDriver::process_input(SharedPtr machine, const TimeSlice& time) { @@ -247,7 +239,6 @@ JackDriver::process_input(SharedPtr machine, const TimeSlice& time) } } - void JackDriver::write_event(Raul::TimeStamp time, size_t size, @@ -293,7 +284,6 @@ JackDriver::write_event(Raul::TimeStamp time, } } - void JackDriver::on_process(jack_nframes_t nframes) { @@ -381,7 +371,6 @@ end: } } - void JackDriver::stop() { @@ -393,7 +382,6 @@ JackDriver::stop() _machine->deactivate(); } - void JackDriver::start_record(bool step) { @@ -404,7 +392,6 @@ JackDriver::start_record(bool step) _recording = 1; } - void JackDriver::finish_record() { @@ -415,7 +402,6 @@ JackDriver::finish_record() _machine->nodes().append(machine->nodes()); } - int JackDriver::jack_process_cb(jack_nframes_t nframes, void* jack_driver) { @@ -428,7 +414,6 @@ JackDriver::jack_process_cb(jack_nframes_t nframes, void* jack_driver) return 0; } - void JackDriver::jack_shutdown_cb(void* jack_driver) { @@ -438,12 +423,10 @@ JackDriver::jack_shutdown_cb(void* jack_driver) me->_client = NULL; } - void JackDriver::jack_error_cb(const char* msg) { cerr << "[JACK] Error: " << msg << endl; } - } // namespace Machina diff --git a/src/engine/JackDriver.hpp b/src/engine/JackDriver.hpp index f1d38b8..fa590c4 100644 --- a/src/engine/JackDriver.hpp +++ b/src/engine/JackDriver.hpp @@ -37,7 +37,6 @@ namespace Machina { class MidiAction; class Node; - /** Realtime JACK Driver. * * "Ticks" are individual frames when running under this driver, and all code @@ -90,11 +89,11 @@ public: private: void process_input(SharedPtr machine, const Raul::TimeSlice& time); - - static void jack_error_cb(const char* msg); + + static void jack_error_cb(const char* msg); static int jack_process_cb(jack_nframes_t nframes, void* me); static void jack_shutdown_cb(void* me); - + void on_process(jack_nframes_t nframes); jack_client_t* _client; @@ -121,7 +120,6 @@ private: bool _is_activated; }; - } // namespace Machina #endif // MACHINA_JACKDRIVER_HPP diff --git a/src/engine/LearnRequest.cpp b/src/engine/LearnRequest.cpp index b103c65..0dd45d6 100644 --- a/src/engine/LearnRequest.cpp +++ b/src/engine/LearnRequest.cpp @@ -20,7 +20,6 @@ namespace Machina { - LearnRequest::LearnRequest(SharedPtr maid, SharedPtr node) : _started(false) , _start_time(TimeUnit(TimeUnit::BEATS, 19200), 0, 0) // irrelevant @@ -61,5 +60,4 @@ LearnRequest::finish(TimeStamp time) //_node->set_duration(duration); } - } diff --git a/src/engine/LearnRequest.hpp b/src/engine/LearnRequest.hpp index 3de98ea..9ddc097 100644 --- a/src/engine/LearnRequest.hpp +++ b/src/engine/LearnRequest.hpp @@ -31,7 +31,6 @@ namespace Machina { class Node; class MidiAction; - /** A request to MIDI learn a certain node. */ class LearnRequest : public Raul::Deletable { @@ -59,7 +58,6 @@ private: SharedPtr _exit_action; }; - } // namespace Machina #endif // MACHINA_LEARNREQUEST_HPP diff --git a/src/engine/Loader.cpp b/src/engine/Loader.cpp index 5902b58..b9b8df9 100644 --- a/src/engine/Loader.cpp +++ b/src/engine/Loader.cpp @@ -37,7 +37,6 @@ using namespace std; namespace Machina { - Loader::Loader(Sord::World& rdf_world) : _rdf_world(rdf_world) { @@ -45,7 +44,6 @@ Loader::Loader(Sord::World& rdf_world) _rdf_world.add_prefix("", "http://drobilla.net/ns/machina#"); } - /** Load (create) all objects from RDF into the engine. * * @param uri URI of machine (resolvable URI to an RDF document). @@ -194,6 +192,5 @@ Loader::load(const Glib::ustring& uri) } } - } // namespace Machina diff --git a/src/engine/Machine.cpp b/src/engine/Machine.cpp index bddc4f9..5f252f4 100644 --- a/src/engine/Machine.cpp +++ b/src/engine/Machine.cpp @@ -39,7 +39,6 @@ static const Raul::Atom false_atom(false); namespace Machina { - Machine::Machine(TimeUnit unit) : _active_nodes(MAX_ACTIVE_NODES, SharedPtr()) , _is_activated(false) @@ -48,7 +47,6 @@ Machine::Machine(TimeUnit unit) { } - /** Copy a Machine. * * Creates a deep copy which is the 'same' machine, but with @@ -79,7 +77,6 @@ Machine::Machine(const Machine& copy) } } - Machine& Machine::operator=(const Machine& other) { @@ -110,7 +107,6 @@ Machine::operator=(const Machine& other) return *this; } - /** Set the MIDI sink to be used for executing MIDI actions. * * MIDI actions will silently do nothing unless this call is passed an @@ -122,7 +118,6 @@ Machine::set_sink(SharedPtr sink) _sink = sink; } - /** Always returns a node, unless there are none */ SharedPtr Machine::random_node() @@ -140,7 +135,6 @@ Machine::random_node() return SharedPtr(); } - /** May return NULL even if edges exist (with low probability) */ SharedPtr Machine::random_edge() @@ -153,7 +147,6 @@ Machine::random_edge() return tail ? tail->random_edge() : SharedPtr(); } - void Machine::add_node(SharedPtr node) { @@ -161,7 +154,6 @@ Machine::add_node(SharedPtr node) _nodes.push_back(node); } - void Machine::remove_node(SharedPtr node) { @@ -171,7 +163,6 @@ Machine::remove_node(SharedPtr node) (*n)->remove_edge_to(node); } - /** Exit all active states and reset time to 0. */ void @@ -195,7 +186,6 @@ Machine::reset(Raul::TimeStamp time) _is_finished = false; } - /** Return the active Node with the earliest exit time. */ SharedPtr @@ -217,7 +207,6 @@ Machine::earliest_node() const return earliest; } - /** Enter a state at the current _time. * * Returns true if node was entered, or false if the maximum active nodes has been reached. @@ -246,8 +235,6 @@ Machine::enter_node(SharedPtr sink, SharedPtr node, Shared return false; } - - /** Exit an active node at the current _time. */ void @@ -303,7 +290,6 @@ Machine::exit_node(SharedPtr sink, SharedPtr node, SharedP } } - /** Run the machine for a (real) time slice. * * Returns the duration of time the machine actually ran. @@ -377,7 +363,6 @@ Machine::run(const Raul::TimeSlice& time, SharedPtr updates) return time.beats_to_ticks(_time).ticks() - time.start_ticks().ticks(); } - /** Push a node onto the learn stack. * * NOT realtime (actions are allocated here). diff --git a/src/engine/MachineBuilder.cpp b/src/engine/MachineBuilder.cpp index 3bf9152..ac06ec1 100644 --- a/src/engine/MachineBuilder.cpp +++ b/src/engine/MachineBuilder.cpp @@ -33,7 +33,6 @@ using namespace Raul; namespace Machina { - MachineBuilder::MachineBuilder(SharedPtr machine, double q, bool step) : _quantization(q) , _time(machine->time().unit()) // = 0 @@ -45,7 +44,6 @@ MachineBuilder::MachineBuilder(SharedPtr machine, double q, bool step) { } - void MachineBuilder::reset() { @@ -55,14 +53,12 @@ MachineBuilder::reset() _connect_node_end_time = _time; // = 0 } - bool MachineBuilder::is_delay_node(SharedPtr node) const { return !node->enter_action() && !node->exit_action(); } - /** Set the duration of a node, with quantization. */ void @@ -72,7 +68,7 @@ MachineBuilder::set_node_duration(SharedPtr node, Raul::TimeDuration d) co node->set_duration(TimeStamp(d.unit(), 1, 0)); return; } - + Raul::TimeStamp q_dur = Quantizer::quantize(TimeStamp(d.unit(), _quantization), d); // Never quantize a note to duration 0 @@ -82,7 +78,6 @@ MachineBuilder::set_node_duration(SharedPtr node, Raul::TimeDuration d) co node->set_duration(q_dur); } - /** Connect two nodes, inserting a delay node between them if necessary. * * If a delay node is added to the machine, it is returned. @@ -115,7 +110,6 @@ MachineBuilder::connect_nodes(SharedPtr m, return delay_node; } - void MachineBuilder::event(Raul::TimeStamp time_offset, size_t ev_size, @@ -251,7 +245,6 @@ MachineBuilder::event(Raul::TimeStamp time_offset, } } - /** Finish the constructed machine and prepare it for use. * Resolve any stuck notes, quantize, etc. */ @@ -286,7 +279,6 @@ MachineBuilder::resolve() } - SharedPtr MachineBuilder::finish() { @@ -295,5 +287,4 @@ MachineBuilder::finish() return _machine; } - } // namespace Machina diff --git a/src/engine/MachineBuilder.hpp b/src/engine/MachineBuilder.hpp index 8c81f91..feac19c 100644 --- a/src/engine/MachineBuilder.hpp +++ b/src/engine/MachineBuilder.hpp @@ -28,7 +28,6 @@ namespace Machina { class Machine; class Node; - class MachineBuilder { public: MachineBuilder(SharedPtr machine, @@ -70,7 +69,6 @@ private: bool _step; }; - } // namespace Machina #endif // MACHINA_MACHINEBUILDER_HPP diff --git a/src/engine/MidiAction.cpp b/src/engine/MidiAction.cpp index a6f161d..6dc1308 100644 --- a/src/engine/MidiAction.cpp +++ b/src/engine/MidiAction.cpp @@ -28,7 +28,6 @@ namespace Machina { - /** Create a MIDI action. * * Creating a NULL MIDIAction is okay, pass event=NULL and @@ -46,13 +45,11 @@ MidiAction::MidiAction(size_t size, set_event(size, event); } - MidiAction::~MidiAction() { delete[] _event.get(); } - /** Set the MIDI event to be emitted when the action executes. * * Returns pointer to old event (caller's responsibility to free if non-NULL). @@ -76,7 +73,6 @@ MidiAction::set_event(size_t size, const byte* new_event) } } - /** Execute the action. * * Safe to call concurrently with set_event. @@ -94,7 +90,6 @@ MidiAction::execute(SharedPtr sink, Raul::TimeStamp time) } } - void MidiAction::write_state(Sord::Model& model) { @@ -112,7 +107,5 @@ MidiAction::write_state(Sord::Model& model) AtomRDF::atom_to_node(model, Atom((int)(_event.get()[1])))); } - } // namespace Machina - diff --git a/src/engine/MidiAction.hpp b/src/engine/MidiAction.hpp index 5c0d825..7103b7d 100644 --- a/src/engine/MidiAction.hpp +++ b/src/engine/MidiAction.hpp @@ -29,7 +29,6 @@ namespace Raul { class MIDISink; } namespace Machina { - class MidiAction : public Action { public: ~MidiAction(); @@ -53,7 +52,6 @@ private: Raul::AtomicPtr _event; }; - } // namespace Machina #endif // MACHINA_MIDIACTION_HPP diff --git a/src/engine/Mutation.cpp b/src/engine/Mutation.cpp index 55d5715..a4a5318 100644 --- a/src/engine/Mutation.cpp +++ b/src/engine/Mutation.cpp @@ -30,7 +30,6 @@ using namespace std; namespace Machina { namespace Mutation { - void Compress::mutate(Machine& machine) { @@ -48,7 +47,6 @@ Compress::mutate(Machine& machine) } } - void AddNode::mutate(Machine& machine) { @@ -83,7 +81,6 @@ AddNode::mutate(Machine& machine) node->add_edge(boost::shared_ptr(new Edge(node, head))); } - void RemoveNode::mutate(Machine& machine) { @@ -94,7 +91,6 @@ RemoveNode::mutate(Machine& machine) machine.remove_node(node); } - void AdjustNode::mutate(Machine& machine) { @@ -113,7 +109,6 @@ AdjustNode::mutate(Machine& machine) } } - void SwapNodes::mutate(Machine& machine) { @@ -141,7 +136,6 @@ SwapNodes::mutate(Machine& machine) b_exit->event()[1] = note_a; } - void AddEdge::mutate(Machine& machine) { @@ -157,7 +151,6 @@ AddEdge::mutate(Machine& machine) } } - void RemoveEdge::mutate(Machine& machine) { @@ -168,7 +161,6 @@ RemoveEdge::mutate(Machine& machine) tail->remove_edge(tail->random_edge()); } - void AdjustEdge::mutate(Machine& machine) { @@ -181,7 +173,6 @@ AdjustEdge::mutate(Machine& machine) } } - } // namespace Mutation } // namespace Machina diff --git a/src/engine/Node.cpp b/src/engine/Node.cpp index a1cd3bc..8092089 100644 --- a/src/engine/Node.cpp +++ b/src/engine/Node.cpp @@ -34,7 +34,6 @@ using namespace std; namespace Machina { - Node::Node(TimeDuration duration, bool initial) : _enter_time(duration.unit()) , _duration(duration) @@ -44,7 +43,6 @@ Node::Node(TimeDuration duration, bool initial) { } - Node::Node(const Node& copy) : Stateful() // don't copy RDF ID , _enter_time(copy._enter_time) @@ -61,7 +59,6 @@ Node::Node(const Node& copy) } } - /** Always returns an edge, unless there are none */ SharedPtr Node::random_edge() @@ -83,7 +80,6 @@ Node::random_edge() return ret; } - void Node::edges_changed() { @@ -102,7 +98,6 @@ Node::edges_changed() _changed = true; } - void Node::set_selector(bool yn) { @@ -114,7 +109,6 @@ Node::set_selector(bool yn) _changed = true; } - void Node::set_enter_action(SharedPtr action) { @@ -122,7 +116,6 @@ Node::set_enter_action(SharedPtr action) _changed = true; } - void Node::set_exit_action(SharedPtr action) { @@ -130,7 +123,6 @@ Node::set_exit_action(SharedPtr action) _changed = true; } - void Node::enter(SharedPtr sink, TimeStamp time) { @@ -144,7 +136,6 @@ Node::enter(SharedPtr sink, TimeStamp time) _enter_action->execute(sink, time); } - void Node::exit(SharedPtr sink, TimeStamp time) { @@ -158,7 +149,6 @@ Node::exit(SharedPtr sink, TimeStamp time) _enter_time = 0; } - void Node::add_edge(SharedPtr edge) { @@ -171,7 +161,6 @@ Node::add_edge(SharedPtr edge) edges_changed(); } - void Node::remove_edge(SharedPtr edge) { @@ -179,7 +168,6 @@ Node::remove_edge(SharedPtr edge) edges_changed(); } - bool Node::connected_to(SharedPtr node) { @@ -190,7 +178,6 @@ Node::connected_to(SharedPtr node) return false; } - SharedPtr Node::remove_edge_to(SharedPtr node) { @@ -206,7 +193,6 @@ Node::remove_edge_to(SharedPtr node) return SharedPtr(); } - void Node::set(URIInt key, const Raul::Atom& value) { @@ -217,7 +203,6 @@ Node::set(URIInt key, const Raul::Atom& value) } } - void Node::write_state(Sord::Model& model) { @@ -258,6 +243,5 @@ Node::write_state(Sord::Model& model) } } - } // namespace Machina diff --git a/src/engine/Node.hpp b/src/engine/Node.hpp index cc9d438..a2411a1 100644 --- a/src/engine/Node.hpp +++ b/src/engine/Node.hpp @@ -33,7 +33,6 @@ using Raul::TimeDuration; using Raul::TimeStamp; using Raul::TimeUnit; - /** A node is a state (as in a FSM diagram), or "note". * * It contains a action, as well as a duration and pointers to it's @@ -98,7 +97,6 @@ private: bool _is_active; }; - } // namespace Machina #endif // MACHINA_NODE_HPP diff --git a/src/engine/Problem.cpp b/src/engine/Problem.cpp index bc32667..f07b531 100644 --- a/src/engine/Problem.cpp +++ b/src/engine/Problem.cpp @@ -38,7 +38,6 @@ using namespace std; namespace Machina { - Problem::Problem(TimeUnit unit, const std::string& target_midi, SharedPtr seed) : _unit(unit) , _target(*this) @@ -73,7 +72,6 @@ Problem::Problem(TimeUnit unit, const std::string& target_midi, SharedPtr Problem::initial_population(size_t gene_size, size_t pop_size) const { @@ -277,7 +272,6 @@ Problem::initial_population(size_t gene_size, size_t pop_size) const return ret; } - /** levenshtein distance (edit distance) */ size_t Problem::distance(const std::vector& source, @@ -362,6 +356,5 @@ Problem::distance(const std::vector& source, return _matrix[n][m]; } - } // namespace Machina diff --git a/src/engine/Problem.hpp b/src/engine/Problem.hpp index 80041a4..01ad564 100644 --- a/src/engine/Problem.hpp +++ b/src/engine/Problem.hpp @@ -25,7 +25,6 @@ namespace Machina { - class Problem : public Eugene::Problem { public: Problem(TimeUnit unit, const std::string& target_midi, SharedPtr seed = SharedPtr()); @@ -118,7 +117,6 @@ private: mutable std::map _fitness; }; - } // namespace Machina #endif // MACHINA_PROBLEM_HPP diff --git a/src/engine/Recorder.cpp b/src/engine/Recorder.cpp index 3bdd0dc..2c2520c 100644 --- a/src/engine/Recorder.cpp +++ b/src/engine/Recorder.cpp @@ -26,7 +26,6 @@ using namespace Raul; namespace Machina { - Recorder::Recorder(size_t buffer_size, TimeUnit unit, double q, bool step) : _unit(unit) , _record_buffer(buffer_size) @@ -34,7 +33,6 @@ Recorder::Recorder(size_t buffer_size, TimeUnit unit, double q, bool step) { } - void Recorder::_whipped() { @@ -48,7 +46,6 @@ Recorder::_whipped() } } - SharedPtr Recorder::finish() { @@ -57,6 +54,5 @@ Recorder::finish() return machine; } - } diff --git a/src/engine/Recorder.hpp b/src/engine/Recorder.hpp index 4c431af..f8cb5c2 100644 --- a/src/engine/Recorder.hpp +++ b/src/engine/Recorder.hpp @@ -28,7 +28,6 @@ namespace Machina { class MachineBuilder; - class Recorder : public Raul::Slave { public: Recorder(size_t buffer_size, TimeUnit unit, double q, bool step); @@ -47,7 +46,6 @@ private: SharedPtr _builder; }; - } // namespace Machina #endif // MACHINA_RECORDER_HPP diff --git a/src/engine/SMFDriver.cpp b/src/engine/SMFDriver.cpp index 3bf49c5..468fb4d 100644 --- a/src/engine/SMFDriver.cpp +++ b/src/engine/SMFDriver.cpp @@ -34,14 +34,12 @@ using namespace std; namespace Machina { - SMFDriver::SMFDriver(Raul::TimeUnit unit) : Driver(SharedPtr()) { _writer = SharedPtr(new Raul::SMFWriter(unit)); } - /** Learn a single track from the MIDI file at @a uri * * @track selects which track of the MIDI file to import, starting from 1. @@ -75,7 +73,6 @@ SMFDriver::learn(const string& filename, unsigned track, double q, Raul::TimeDur return SharedPtr(); } - /** Learn all tracks from a MIDI file into a single machine. * * This will result in one disjoint subgraph in the machine for each track. @@ -105,7 +102,6 @@ SMFDriver::learn(const string& filename, double q, Raul::TimeStamp max_duration) return SharedPtr(); } - void SMFDriver::learn_track(SharedPtr builder, Raul::SMFReader& reader, @@ -140,7 +136,6 @@ SMFDriver::learn_track(SharedPtr builder, builder->resolve(); } - void SMFDriver::run(SharedPtr machine, Raul::TimeStamp max_time) { @@ -151,5 +146,4 @@ SMFDriver::run(SharedPtr machine, Raul::TimeStamp max_time) machine->run(time, SharedPtr()); } - } // namespace Machina diff --git a/src/engine/SMFDriver.hpp b/src/engine/SMFDriver.hpp index 7081dc2..c031ebb 100644 --- a/src/engine/SMFDriver.hpp +++ b/src/engine/SMFDriver.hpp @@ -35,7 +35,6 @@ namespace Machina { class Node; class Machine; - class SMFDriver : public Driver, public boost::enable_shared_from_this { public: @@ -72,7 +71,6 @@ private: Raul::TimeDuration max_duration); }; - } // namespace Machina #endif // MACHINA_SMFDRIVER_HPP diff --git a/src/engine/Schrodinbit.hpp b/src/engine/Schrodinbit.hpp index 90e2949..0bd1363 100644 --- a/src/engine/Schrodinbit.hpp +++ b/src/engine/Schrodinbit.hpp @@ -18,7 +18,6 @@ #ifndef SCHRODINBIT_HPP #define SCHRODINBIT_HPP - /** A flag which becomes false when it's value is observed */ class Schrodinbit { @@ -40,6 +39,5 @@ private: bool _flag; }; - #endif // SCHRODINBIT_HPP diff --git a/src/engine/Stateful.cpp b/src/engine/Stateful.cpp index 61ec7cd..701324a 100644 --- a/src/engine/Stateful.cpp +++ b/src/engine/Stateful.cpp @@ -26,7 +26,6 @@ Stateful::Stateful() { } - const Sord::Node& Stateful::rdf_id(Sord::World& world) const { diff --git a/src/engine/jack_compat.h b/src/engine/jack_compat.h index e91ef9a..dd4bf3b 100644 --- a/src/engine/jack_compat.h +++ b/src/engine/jack_compat.h @@ -18,7 +18,6 @@ #ifndef JACK_COMPAT_H #define JACK_COMPAT_H - #if defined(JACK_MIDI_NEEDS_NFRAMES) jack_nframes_t diff --git a/src/engine/machina/Controller.hpp b/src/engine/machina/Controller.hpp index 000fcad..48165b9 100644 --- a/src/engine/machina/Controller.hpp +++ b/src/engine/machina/Controller.hpp @@ -63,7 +63,7 @@ private: return lhs->id() < rhs->id(); } }; - + typedef std::set, StatefulComparator> Objects; Objects _objects; diff --git a/src/engine/machina/Driver.hpp b/src/engine/machina/Driver.hpp index 814f041..508430e 100644 --- a/src/engine/machina/Driver.hpp +++ b/src/engine/machina/Driver.hpp @@ -37,7 +37,7 @@ public: SharedPtr update_sink() { return _updates; } void set_update_sink(SharedPtr b) { _updates = b; } - + virtual void set_bpm(double bpm) = 0; virtual void set_quantization(double q) = 0; @@ -56,7 +56,6 @@ protected: SharedPtr _updates; }; - } // namespace Machina #endif // MACHINA_JACKDRIVER_HPP diff --git a/src/engine/machina/Engine.hpp b/src/engine/machina/Engine.hpp index 48ef64a..1df08f2 100644 --- a/src/engine/machina/Engine.hpp +++ b/src/engine/machina/Engine.hpp @@ -31,7 +31,6 @@ namespace Machina { class Machine; - class Engine { public: Engine(SharedPtr driver, Sord::World& rdf_world); @@ -63,7 +62,6 @@ private: Loader _loader; }; - } // namespace Machina #endif // MACHINA_ENGINE_HPP diff --git a/src/engine/machina/Evolver.hpp b/src/engine/machina/Evolver.hpp index b12d56a..05e9f84 100644 --- a/src/engine/machina/Evolver.hpp +++ b/src/engine/machina/Evolver.hpp @@ -32,7 +32,6 @@ namespace Machina { class Machine; class Problem; - class Evolver : public Raul::Thread { public: Evolver(Raul::TimeUnit unit, const string& target_midi, SharedPtr seed); @@ -53,7 +52,6 @@ private: Schrodinbit _improvement; }; - } // namespace Machina #endif // MACHINA_EVOLVER_HPP diff --git a/src/engine/machina/Loader.hpp b/src/engine/machina/Loader.hpp index b3d9282..c7b8fb2 100644 --- a/src/engine/machina/Loader.hpp +++ b/src/engine/machina/Loader.hpp @@ -31,7 +31,6 @@ namespace Machina { class Machine; - class Loader { public: Loader(Sord::World& rdf_world); @@ -42,7 +41,6 @@ private: Sord::World& _rdf_world; }; - } // namespace Machina #endif // MACHINA_LOADER_HPP diff --git a/src/engine/machina/Machine.hpp b/src/engine/machina/Machine.hpp index 7b763d1..751f3c0 100644 --- a/src/engine/machina/Machine.hpp +++ b/src/engine/machina/Machine.hpp @@ -101,7 +101,6 @@ private: Nodes _nodes; }; - } // namespace Machina #endif // MACHINA_MACHINE_HPP diff --git a/src/gui/EdgeView.cpp b/src/gui/EdgeView.cpp index 725d685..9feb514 100644 --- a/src/gui/EdgeView.cpp +++ b/src/gui/EdgeView.cpp @@ -60,7 +60,6 @@ inline static uint32_t edge_color(float prob) /* end probability colour stuff */ - using namespace FlowCanvas; EdgeView::EdgeView(SharedPtr canvas, @@ -78,14 +77,12 @@ EdgeView::EdgeView(SharedPtr canvas, sigc::mem_fun(this, &EdgeView::on_property)); } - float EdgeView::probability() const { return _edge->get(URIs::instance().machina_probability).get_float(); } - double EdgeView::length_hint() const { @@ -93,7 +90,6 @@ EdgeView::length_hint() const return tail->node()->get(URIs::instance().machina_duration).get_float() * 10.0; } - void EdgeView::show_label(bool show) { @@ -101,7 +97,6 @@ EdgeView::show_label(bool show) set_color(edge_color(probability())); } - bool EdgeView::on_event(GdkEvent* ev) { @@ -126,7 +121,6 @@ EdgeView::on_event(GdkEvent* ev) return false; } - void EdgeView::on_property(Machina::URIInt key, const Raul::Atom& value) { diff --git a/src/gui/EdgeView.hpp b/src/gui/EdgeView.hpp index d9ffe71..09065c1 100644 --- a/src/gui/EdgeView.hpp +++ b/src/gui/EdgeView.hpp @@ -48,5 +48,4 @@ private: SharedPtr _edge; }; - #endif // MACHINA_EDGEVIEW_HPP diff --git a/src/gui/MachinaCanvas.hpp b/src/gui/MachinaCanvas.hpp index dc23505..875b694 100644 --- a/src/gui/MachinaCanvas.hpp +++ b/src/gui/MachinaCanvas.hpp @@ -66,5 +66,4 @@ private: WeakPtr _last_clicked; }; - #endif // MACHINA_CANVAS_HPP_HPP diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp index fe7462e..c3083ed 100644 --- a/src/gui/MachinaGUI.cpp +++ b/src/gui/MachinaGUI.cpp @@ -43,7 +43,6 @@ using namespace Machina; - MachinaGUI::MachinaGUI(SharedPtr engine) : _refresh(false) , _evolve(false) @@ -201,12 +200,10 @@ MachinaGUI::MachinaGUI(SharedPtr engine) _client_model->signal_erase_object.connect(sigc::mem_fun(this, &MachinaGUI::on_erase_object)); } - MachinaGUI::~MachinaGUI() { } - #ifdef HAVE_EUGENE bool MachinaGUI::evolve_callback() @@ -222,7 +219,6 @@ MachinaGUI::evolve_callback() } #endif - bool MachinaGUI::idle_callback() { @@ -230,7 +226,6 @@ MachinaGUI::idle_callback() return true; } - bool MachinaGUI::scrolled_window_event(GdkEvent* event) { @@ -256,14 +251,12 @@ MachinaGUI::scrolled_window_event(GdkEvent* event) return false; } - void MachinaGUI::arrange() { _canvas->arrange(_menu_view_time_edges->get_active()); } - void MachinaGUI::load_target_clicked() { @@ -284,7 +277,6 @@ MachinaGUI::load_target_clicked() _target_filename = dialog.get_filename(); } - #ifdef HAVE_EUGENE void MachinaGUI::evolve_toggled() @@ -307,7 +299,6 @@ MachinaGUI::evolve_toggled() } #endif - void MachinaGUI::random_mutation(SharedPtr machine) { @@ -317,7 +308,6 @@ MachinaGUI::random_mutation(SharedPtr machine) mutate(machine, machine->nodes().size() < 2 ? 1 : rand() % 7); } - void MachinaGUI::mutate(SharedPtr machine, unsigned mutation) { @@ -361,7 +351,6 @@ MachinaGUI::mutate(SharedPtr machine, unsigned mutation) #endif } - void MachinaGUI::update_toolbar() { @@ -371,7 +360,6 @@ MachinaGUI::update_toolbar() _quantize_spinbutton->set_sensitive(_quantize_checkbutton->get_active()); } - void MachinaGUI::quantize_changed() { @@ -383,21 +371,18 @@ MachinaGUI::quantize_changed() update_toolbar(); } - void MachinaGUI::tempo_changed() { _engine->set_bpm(_bpm_spinbutton->get_value_as_int()); } - void MachinaGUI::zoom(double z) { _canvas->set_zoom(z); } - /** Update the sensitivity status of menus to reflect the present. */ void @@ -407,14 +392,12 @@ MachinaGUI::connect_widgets() using namespace std; - void MachinaGUI::menu_file_quit() { _main_window->hide(); } - void MachinaGUI::menu_file_open() { @@ -441,7 +424,6 @@ MachinaGUI::menu_file_open() } } - void MachinaGUI::menu_file_save() { @@ -457,7 +439,6 @@ MachinaGUI::menu_file_save() } } - void MachinaGUI::menu_file_save_as() { @@ -510,7 +491,6 @@ MachinaGUI::menu_file_save_as() } } - void MachinaGUI::menu_import_midi() { @@ -535,7 +515,6 @@ MachinaGUI::menu_import_midi() dialog.set_extra_widget(*extra_widget); extra_widget->show_all(); - const int result = dialog.run(); if (result == Gtk::RESPONSE_OK) { @@ -560,7 +539,6 @@ MachinaGUI::menu_import_midi() } } - void MachinaGUI::menu_export_midi() { @@ -594,7 +572,6 @@ MachinaGUI::menu_export_midi() } } - void MachinaGUI::menu_export_graphviz() { @@ -609,7 +586,6 @@ MachinaGUI::menu_export_graphviz() _canvas->render_to_dot(dialog.get_filename()); } - void MachinaGUI::show_toolbar_toggled() { @@ -619,7 +595,6 @@ MachinaGUI::show_toolbar_toggled() _toolbar->hide(); } - void MachinaGUI::show_labels_toggled() { @@ -639,7 +614,6 @@ MachinaGUI::show_labels_toggled() } } - void MachinaGUI::menu_help_about() { @@ -647,7 +621,6 @@ MachinaGUI::menu_help_about() _about_window->show(); } - void MachinaGUI::menu_help_help() { @@ -656,7 +629,6 @@ MachinaGUI::menu_help_help() _help_dialog->hide(); } - void MachinaGUI::record_toggled() { @@ -669,7 +641,6 @@ MachinaGUI::record_toggled() } } - void MachinaGUI::stop_clicked() { @@ -687,7 +658,6 @@ MachinaGUI::stop_clicked() update_toolbar(); } - void MachinaGUI::play_toggled() { diff --git a/src/gui/MachinaGUI.hpp b/src/gui/MachinaGUI.hpp index 58dc48f..72c2f62 100644 --- a/src/gui/MachinaGUI.hpp +++ b/src/gui/MachinaGUI.hpp @@ -113,7 +113,7 @@ protected: SharedPtr _engine; SharedPtr _client_model; SharedPtr _controller; - + SharedPtr _maid; SharedPtr _evolver; diff --git a/src/gui/NodePropertiesWindow.cpp b/src/gui/NodePropertiesWindow.cpp index b896902..4f883e8 100644 --- a/src/gui/NodePropertiesWindow.cpp +++ b/src/gui/NodePropertiesWindow.cpp @@ -22,10 +22,8 @@ using namespace std; using namespace Machina; - NodePropertiesWindow* NodePropertiesWindow::_instance = NULL; - NodePropertiesWindow::NodePropertiesWindow(BaseObjectType* cobject, const Glib::RefPtr& xml) : Gtk::Dialog(cobject) { @@ -36,7 +34,7 @@ NodePropertiesWindow::NodePropertiesWindow(BaseObjectType* cobject, const Glib:: xml->get_widget("node_properties_apply_button", _apply_button); xml->get_widget("node_properties_cancel_button", _cancel_button); xml->get_widget("node_properties_ok_button", _ok_button); - + _apply_button->signal_clicked().connect( sigc::mem_fun(this, &NodePropertiesWindow::apply_clicked)); _cancel_button->signal_clicked().connect( @@ -45,12 +43,10 @@ NodePropertiesWindow::NodePropertiesWindow(BaseObjectType* cobject, const Glib:: sigc::mem_fun(this, &NodePropertiesWindow::ok_clicked)); } - NodePropertiesWindow::~NodePropertiesWindow() { } - void NodePropertiesWindow::apply_clicked() { @@ -73,7 +69,6 @@ NodePropertiesWindow::apply_clicked() #endif } - void NodePropertiesWindow::cancel_clicked() { @@ -82,7 +77,6 @@ NodePropertiesWindow::cancel_clicked() _instance = NULL; } - void NodePropertiesWindow::ok_clicked() { @@ -90,7 +84,6 @@ NodePropertiesWindow::ok_clicked() cancel_clicked(); } - void NodePropertiesWindow::set_node(SharedPtr node) { @@ -111,7 +104,6 @@ NodePropertiesWindow::set_node(SharedPtr node) #endif } - void NodePropertiesWindow::present(Gtk::Window* parent, SharedPtr node) { diff --git a/src/gui/NodePropertiesWindow.hpp b/src/gui/NodePropertiesWindow.hpp index 2751d77..9e9ecd7 100644 --- a/src/gui/NodePropertiesWindow.hpp +++ b/src/gui/NodePropertiesWindow.hpp @@ -53,5 +53,4 @@ private: Gtk::Button* _ok_button; }; - #endif // NODEPROPERTIESWINDOW_HPP diff --git a/src/gui/NodeView.cpp b/src/gui/NodeView.cpp index 2810f99..3d29cf7 100644 --- a/src/gui/NodeView.cpp +++ b/src/gui/NodeView.cpp @@ -86,7 +86,7 @@ midi_note_name(uint8_t num) const uint8_t octave = num / 12; num -= octave * 12; - + static char str[8]; snprintf(str, sizeof(str), "%s%d", notes[num], octave); return str; @@ -104,7 +104,7 @@ NodeView::show_label(bool show) } } } - + set_name(""); } diff --git a/src/gui/NodeView.hpp b/src/gui/NodeView.hpp index a70e821..8023058 100644 --- a/src/gui/NodeView.hpp +++ b/src/gui/NodeView.hpp @@ -58,5 +58,4 @@ private: sigc::connection _enter_action_connection; }; - #endif // MACHINA_NODEVIEW_HPP diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 4f23e18..b4842e1 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -30,7 +30,6 @@ using namespace std; using namespace Machina; - int main(int argc, char** argv) { @@ -89,4 +88,3 @@ main(int argc, char** argv) return 0; } - diff --git a/src/machina.cpp b/src/machina.cpp index f4eea66..a08e39e 100644 --- a/src/machina.cpp +++ b/src/machina.cpp @@ -33,10 +33,8 @@ using namespace std; using namespace Machina; - bool quit = false; - void catch_int(int) { @@ -48,7 +46,6 @@ catch_int(int) quit = true; } - int main(int argc, char** argv) { diff --git a/src/midi2machina.cpp b/src/midi2machina.cpp index 3e35b99..532336c 100644 --- a/src/midi2machina.cpp +++ b/src/midi2machina.cpp @@ -28,10 +28,8 @@ using namespace std; using namespace Machina; - bool quit = false; - void catch_int(int) { @@ -43,7 +41,6 @@ catch_int(int) quit = true; } - int main(int argc, char** argv) { -- cgit v1.2.1