← Back to branch summary

~brandontschaefer/mir/first-round-deprecation

« back to all changes in this revision

Viewing changes to src/client/mir_screencast.h

  • 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/mir_screencast.h
42
42
{
43
43
class DisplayServer;
44
44
}
45
 
class ClientBufferStreamFactory;
46
 
class ClientBufferStream;
 
45
class MirBufferStreamFactory;
47
46
}
48
47
}
49
48
 
84
83
 
85
84
    EGLNativeWindowType egl_native_window();
86
85
 
87
 
    mir::client::ClientBufferStream* get_buffer_stream();
 
86
    MirBufferStream* get_buffer_stream();
88
87
 
89
88
private:
90
89
    void screencast_created(
95
94
    std::mutex mutable mutex;
96
95
    mir::client::rpc::DisplayServer* const server{nullptr};
97
96
    MirConnection* const connection{nullptr};
98
 
    std::shared_ptr<mir::client::ClientBufferStream> buffer_stream;
 
97
    std::shared_ptr<MirBufferStream> buffer_stream;
99
98
 
100
99
    std::unique_ptr<mir::protobuf::Screencast> const protobuf_screencast;
101
100
    std::unique_ptr<mir::protobuf::Void> const protobuf_void;