From: Mikko Rasa Date: Wed, 22 May 2019 20:17:40 +0000 (+0300) Subject: Minor cleanups X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=7857d6ec5961f94bc926b1a969f2c841713f9650;p=libs%2Fdemoscene.git Minor cleanups --- diff --git a/source/fadeoverlay.h b/source/fadeoverlay.h index e25d168..e427c4e 100644 --- a/source/fadeoverlay.h +++ b/source/fadeoverlay.h @@ -47,7 +47,6 @@ private: public: FadeOverlay(Msp::DataFile::Collection &); - void set_content(Msp::GL::Renderable *); void set_color(const Msp::GL::Color &); virtual void render(Msp::GL::Renderer &, const Msp::GL::Texture2D &, const Msp::GL::Texture2D &); diff --git a/source/sequencer.cpp b/source/sequencer.cpp index 3807e1c..8bca70b 100644 --- a/source/sequencer.cpp +++ b/source/sequencer.cpp @@ -34,12 +34,12 @@ void Sequencer::add_action(Action &act, float sb, float eb) if(sb<0 || sb>eb) throw invalid_argument("Sequencer::add_action"); - Segment seq_act; - seq_act.action = &act; - seq_act.start_beat = sb; - seq_act.end_beat = eb; + Segment seg; + seg.action = &act; + seg.start_beat = sb; + seg.end_beat = eb; auto i = find_if(segments, [=](const Segment &s){ return s.start_beat>sb; }); - segments.insert(i, seq_act); + segments.insert(i, seg); } void Sequencer::start() diff --git a/source/stage.cpp b/source/stage.cpp index cbe576f..94782ad 100644 --- a/source/stage.cpp +++ b/source/stage.cpp @@ -43,16 +43,16 @@ void Stage::UseInView::start(float, float) Stage::UseInView::Loader::Loader(UseInView &u, Demo &d): DataFile::DerivedObjectLoader(u, d) { - add("view", &Loader::view); add("stage", &Loader::stage); + add("view", &Loader::view); } -void Stage::UseInView::Loader::view(const string &n) +void Stage::UseInView::Loader::stage(const string &n) { - obj.view = &demo.get_thing(n); + obj.stage = &demo.get_thing(n); } -void Stage::UseInView::Loader::stage(const string &n) +void Stage::UseInView::Loader::view(const string &n) { - obj.stage = &demo.get_thing(n); + obj.view = &demo.get_thing(n); } diff --git a/source/stage.h b/source/stage.h index c43cccb..1ab32d8 100644 --- a/source/stage.h +++ b/source/stage.h @@ -16,8 +16,8 @@ struct Stage Loader(UseInView &, Demo &); private: - void view(const std::string &); void stage(const std::string &); + void view(const std::string &); }; private: