← Back to branch summary

~ci-train-bot/media-hub/media-hub-ubuntu-zesty-1823

« back to all changes in this revision

Viewing changes to src/core/media/server/server.cpp

  • Committer: Bileto Bot
  • Date: 2016-08-15 21:07:12 UTC
  • mfrom: (203.1.7 media-hub-desktop)
  • Revision ID: ci-train-bot@canonical.com-20160815210712-taplugkglgfm5s9t
Make media-hub work on the desktop with Unity7/Unity8 sessions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/media/server/server.cpp
58
58
            severity = media::Logger::Severity::kFatal;
59
59
        else
60
60
            std::cerr << "Invalid log level \"" << level
61
 
                << "\", setting to info. Valid options: [trace, debug, info, warning, error, fatal]. "
 
61
                << "\", setting to info. Valid options: [trace, debug, info, warning, error, fatal]."
62
62
                << std::endl;
63
63
    }
64
64
    else
71
71
// All platform-specific initialization routines go here.
72
72
void platform_init()
73
73
{
74
 
    decoding_service_init();
 
74
    const media::AVBackend::Backend b {media::AVBackend::get_backend_type()};
 
75
    switch (b)
 
76
    {
 
77
        case media::AVBackend::Backend::hybris:
 
78
            MH_DEBUG("Found hybris backend");
 
79
            decoding_service_init();
 
80
            break;
 
81
        case media::AVBackend::Backend::none:
 
82
            MH_WARNING("No video backend selected. Video functionality won't work.");
 
83
            break;
 
84
        default:
 
85
            MH_INFO("Invalid or no A/V backend specified, using \"hybris\" as a default.");
 
86
            decoding_service_init();
 
87
    }
75
88
}
76
89
}
77
90
#else  // MEDIA_HUB_HAVE_HYBRIS_MEDIA_COMPAT_LAYER