X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=f502eb0e4590c86092588841bd04298e1f4f4600;hb=79cff66d44285fa9cb4548104746d1cc6fb81e9c;hp=f45880d321be6d2a1c17c5a61b7ba0babc28e846;hpb=ec73adf2818b4d2bd091778bddd4cba41714d2eb;p=nageru diff --git a/mixer.cpp b/mixer.cpp index f45880d..f502eb0 100644 --- a/mixer.cpp +++ b/mixer.cpp @@ -1396,10 +1396,10 @@ void Mixer::render_one_frame(int64_t duration) for (int i = 1; i < theme->get_num_channels() + 2; ++i) { DisplayFrame display_frame; Theme::Chain chain = theme->get_chain(i, pts(), global_flags.width, global_flags.height, input_state); // FIXME: dimensions - display_frame.chain = chain.chain; - display_frame.setup_chain = chain.setup_chain; + display_frame.chain = move(chain.chain); + display_frame.setup_chain = move(chain.setup_chain); display_frame.ready_fence = fence; - display_frame.input_frames = chain.input_frames; + display_frame.input_frames = move(chain.input_frames); display_frame.temp_textures = {}; output_channel[i].output_frame(display_frame); } @@ -1530,7 +1530,7 @@ void Mixer::OutputChannel::output_frame(DisplayFrame frame) if (has_ready_frame) { parent->release_display_frame(&ready_frame); } - ready_frame = frame; + ready_frame = move(frame); has_ready_frame = true; // Call the callbacks under the mutex (they should be short), @@ -1593,7 +1593,7 @@ bool Mixer::OutputChannel::get_display_frame(DisplayFrame *frame) } if (has_ready_frame) { assert(!has_current_frame); - current_frame = ready_frame; + current_frame = move(ready_frame); ready_frame.ready_fence.reset(); // Drop the refcount. ready_frame.input_frames.clear(); // Drop the refcounts. has_current_frame = true;