← Back to branch summary

~ubuntu-branches/ubuntu/vivid/mir/vivid

« back to all changes in this revision

Viewing changes to include/server/mir/default_server_configuration.h

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2014-02-04 14:49:07 UTC
  • mto: This revision was merged to the branch mainline in revision 61.
  • Revision ID: package-import@ubuntu.com-20140204144907-o3ruhix0ey26lchl
Tags: upstream-0.1.4+14.04.20140204
Import upstream version 0.1.4+14.04.20140204

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/server/mir/default_server_configuration.h
36
36
class DisplayBufferCompositorFactory;
37
37
class Compositor;
38
38
class RendererFactory;
 
39
class CompositorReport;
39
40
}
40
41
namespace frontend
41
42
{
64
65
}
65
66
namespace time
66
67
{
67
 
class TimeSource;
 
68
class Clock;
68
69
}
69
70
namespace scene
70
71
{
112
113
class Logger;
113
114
}
114
115
 
115
 
class DefaultServerConfiguration : public virtual ServerConfiguration, DefaultConfigurationOptions
 
116
class DefaultServerConfiguration : public virtual ServerConfiguration, protected DefaultConfigurationOptions
116
117
{
117
118
public:
118
119
    DefaultServerConfiguration(int argc, char const* argv[]);
150
151
    /** @name compositor configuration - customization
151
152
     * configurable interfaces for modifying compositor
152
153
     *  @{ */
 
154
    virtual std::shared_ptr<compositor::CompositorReport> the_compositor_report();
153
155
    virtual std::shared_ptr<compositor::DisplayBufferCompositorFactory> the_display_buffer_compositor_factory();
154
156
    /** @} */
155
157
 
228
230
    virtual std::shared_ptr<logging::Logger> the_logger();
229
231
    /** @} */
230
232
 
231
 
    virtual std::shared_ptr<time::TimeSource>    the_time_source();
 
233
    virtual std::shared_ptr<time::Clock> the_clock();
232
234
 
233
235
protected:
234
236
    using DefaultConfigurationOptions::the_options;
237
239
 
238
240
    virtual std::shared_ptr<input::InputChannelFactory> the_input_channel_factory();
239
241
    virtual std::shared_ptr<scene::MediatingDisplayChanger> the_mediating_display_changer();
 
242
    virtual std::shared_ptr<frontend::ProtobufIpcFactory> the_ipc_factory(
 
243
        std::shared_ptr<frontend::Shell> const& shell,
 
244
        std::shared_ptr<graphics::GraphicBufferAllocator> const& allocator);
240
245
 
241
246
    CachedPtr<frontend::Connector>   connector;
242
247
 
278
283
    CachedPtr<shell::SurfaceConfigurator> shell_surface_configurator;
279
284
    CachedPtr<compositor::DisplayBufferCompositorFactory> display_buffer_compositor_factory;
280
285
    CachedPtr<compositor::Compositor> compositor;
 
286
    CachedPtr<compositor::CompositorReport> compositor_report;
281
287
    CachedPtr<logging::Logger> logger;
282
288
    CachedPtr<graphics::DisplayReport> display_report;
283
 
    CachedPtr<time::TimeSource> time_source;
 
289
    CachedPtr<time::Clock> clock;
284
290
    CachedPtr<MainLoop> main_loop;
285
291
    CachedPtr<ServerStatusListener> server_status_listener;
286
292
    CachedPtr<graphics::DisplayConfigurationPolicy> display_configuration_policy;
289
295
 
290
296
private:
291
297
    std::shared_ptr<input::EventFilter> const default_filter;
292
 
    // the communications interface to use
293
 
    virtual std::shared_ptr<frontend::ProtobufIpcFactory> the_ipc_factory(
294
 
        std::shared_ptr<frontend::Shell> const& shell,
295
 
        std::shared_ptr<graphics::GraphicBufferAllocator> const& allocator);
296
298
 
297
299
    virtual std::string the_socket_file() const;
298
300