← Back to branch summary

~alan-griffiths/mir/knee-jerk-mir_surface_state_automatic

« back to all changes in this revision

Viewing changes to src/client/mir_connection.cpp

  • Committer: Kevin DuBois
  • Date: 2012-11-13 01:36:29 UTC
  • mfrom: (245 trunk)
  • mto: This revision was merged to the branch mainline in revision 246.
  • Revision ID: kevin.dubois@canonical.com-20121113013629-q4496w4mp5e33auk
merge in base branch. move the demo clients to a new directory, examples/

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/client/mir_connection.cpp
55
55
    , server(&channel)
56
56
    , log(log)
57
57
{
58
 
    platform = mcl::create_client_platform();
59
 
 
60
58
    {
61
59
        lock_guard<mutex> lock(connection_guard);
62
60
        valid_connections.insert(this);
137
135
 
138
136
void MirConnection::connected(mir_connected_callback callback, void * context)
139
137
{
 
138
    auto platform_package = std::make_shared<MirPlatformPackage>();
 
139
    populate(*platform_package);
 
140
    platform = mcl::create_client_platform(platform_package);
 
141
 
140
142
    callback(this, context);
141
143
    connect_wait_handle.result_received();
142
 
 
143
144
}
144
145
 
145
146
MirWaitHandle* MirConnection::connect(
228
229
        display_info.height = 0;
229
230
    }
230
231
}
 
232
 
 
233
 
 
234
std::shared_ptr<mir::client::ClientPlatform> MirConnection::get_client_platform()
 
235
{
 
236
    return platform;
 
237
}