← Back to branch summary

~brandontschaefer/mir/first-round-deprecation

« back to all changes in this revision

Viewing changes to src/client/screencast_stream.cpp

  • Committer: Brandon Schaefer
  • Date: 2016-12-13 17:59:30 UTC
  • mfrom: (3787.1.93 development-branch)
  • Revision ID: brandon.schaefer@canonical.com-20161213175930-j9o7qn0b11n3kzlm
* Merge trunk, fix conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/client/screencast_stream.cpp
119
119
    }
120
120
}
121
121
 
122
 
MirWaitHandle* mcl::ScreencastStream::next_buffer(std::function<void()> const& done)
 
122
MirWaitHandle* mcl::ScreencastStream::swap_buffers(std::function<void()> const& done)
123
123
{
124
124
    std::unique_lock<decltype(mutex)> lock(mutex);
125
125
    secured_region.reset();
181
181
        mir_display_output_id_invalid};
182
182
}
183
183
 
184
 
void mcl::ScreencastStream::request_and_wait_for_next_buffer()
 
184
void mcl::ScreencastStream::swap_buffers_sync()
185
185
{
186
 
    next_buffer([](){})->wait_for_all();
 
186
    swap_buffers([](){})->wait_for_all();
187
187
}
188
188
 
189
189
uint32_t mcl::ScreencastStream::get_current_buffer_id()
269
269
    BOOST_THROW_EXCEPTION(std::logic_error("Attempt to set size on screencast is invalid"));
270
270
}
271
271
 
 
272
geom::Size mcl::ScreencastStream::size() const
 
273
{
 
274
    BOOST_THROW_EXCEPTION(std::logic_error("Attempt to get size on screencast is invalid"));
 
275
}
 
276
 
272
277
MirWaitHandle* mcl::ScreencastStream::set_scale(float)
273
278
{
274
279
    BOOST_THROW_EXCEPTION(std::logic_error("Attempt to set scale on screencast is invalid"));