← Back to branch summary

~thomas-voss/unity-mir/explicit-gcc-version

« back to all changes in this revision

Viewing changes to src/unity-mir/qmirserver.cpp

  • Committer: CI bot
  • Author(s): Ricardo Mendoza
  • Date: 2014-06-12 10:47:11 UTC
  • mfrom: (221.2.6 unity-mir)
  • Revision ID: ps-jenkins@lists.canonical.com-20140612104711-8jpxvifxzhgxzc2i
Migrate to Platform API v2 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/unity-mir/qmirserver.cpp
22
22
#include <mir/main_loop.h>
23
23
 
24
24
// Platform API
25
 
#include <application/ubuntu_application_api_mirserver_priv.h>
 
25
#include <ubuntu/application/init.h>
26
26
 
27
27
// Qt
28
28
#include <QCoreApplication>
29
29
#include <QDebug>
30
30
#include <QThread>
 
31
#include <QFile>
31
32
 
32
33
// Std
33
34
#include <chrono>
58
59
    std::thread *t;
59
60
    bool mirServerShutDown = false;
60
61
 
 
62
    QFile file("/etc/ubuntu-platform-api/application.conf");
 
63
    if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
 
64
        QByteArray plugin = file.readLine();
 
65
        if (plugin.contains("mirclient")) {
 
66
            plugin.replace("mirclient", QByteArray("mirserver"));
 
67
            plugin = plugin.trimmed();
 
68
            setenv("UBUNTU_PLATFORM_API_BACKEND", plugin.data(), 1);
 
69
        }
 
70
    }
 
71
 
61
72
    mir::run_mir(*config, [&](mir::DisplayServer &server) {
62
 
        ua_ui_mirserver_init(*config);
 
73
        u_application_init(dynamic_cast<mir::DefaultServerConfiguration*>(config));
63
74
 
64
75
        // Mir initiates shutdown on SIGINT & SIGTERM, need to distinguish that shutdown from a
65
76
        // client-initiated shutdown. Do this by installing a custom signal handler that is run
99
110
        }
100
111
    }
101
112
    t->join();
102
 
    ua_ui_mirserver_finish();
 
113
    u_application_finish();
103
114
    delete config;
104
115
    return 0;
105
116
}