← Back to branch summary

~brandontschaefer/mir/first-round-deprecation

« back to all changes in this revision

Viewing changes to src/server/report/logging/display_configuration_report.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/server/report/logging/display_configuration_report.h
19
19
#ifndef MIR_DISPLAYCONFIGURATIONREPORT_H
20
20
#define MIR_DISPLAYCONFIGURATIONREPORT_H
21
21
 
22
 
#include "mir/graphics/display_configuration_report.h"
 
22
#include "mir/graphics/display_configuration_observer.h"
23
23
 
24
24
#include <memory>
25
25
 
26
26
namespace mir
27
27
{
28
 
namespace logging { class Logger; }
 
28
namespace logging { class Logger; enum class Severity; }
29
29
 
30
30
namespace report
31
31
{
32
32
namespace logging
33
33
{
34
 
class DisplayConfigurationReport : public mir::graphics::DisplayConfigurationReport
 
34
class DisplayConfigurationReport : public mir::graphics::DisplayConfigurationObserver
35
35
{
36
36
public:
37
37
    DisplayConfigurationReport(std::shared_ptr<mir::logging::Logger> const& logger);
38
38
    ~DisplayConfigurationReport();
39
39
 
40
 
    virtual void initial_configuration(graphics::DisplayConfiguration const& configuration) override;
41
 
 
42
 
    virtual void new_configuration(graphics::DisplayConfiguration const& configuration) override;
 
40
    void configuration_applied(
 
41
        std::shared_ptr<graphics::DisplayConfiguration const> const& config) override;
 
42
 
 
43
    void base_configuration_updated(std::shared_ptr<graphics::DisplayConfiguration const> const& base_config) override;
 
44
 
 
45
    void configuration_failed(
 
46
        std::shared_ptr<graphics::DisplayConfiguration const> const& attempted,
 
47
        std::exception const& error) override;
 
48
 
 
49
    void initial_configuration(
 
50
        std::shared_ptr<graphics::DisplayConfiguration const> const& configuration) override;
 
51
 
 
52
    void catastrophic_configuration_error(
 
53
        std::shared_ptr<graphics::DisplayConfiguration const> const& failed_fallback,
 
54
        std::exception const& error) override;
43
55
 
44
56
private:
45
 
    void log_configuration(graphics::DisplayConfiguration const& configuration) const;
 
57
    void log_configuration(
 
58
        mir::logging::Severity severity,
 
59
        graphics::DisplayConfiguration const& configuration) const;
46
60
    std::shared_ptr<mir::logging::Logger> const logger;
47
61
};
48
62
}