← Back to branch summary

~ci-train-bot/qtubuntu-media/qtubuntu-media-ubuntu-yakkety-landing-056

« back to all changes in this revision

Viewing changes to tests/unit/service.cpp

  • Committer: CI Train Bot
  • Author(s): Jim Hodapp
  • Date: 2016-03-22 19:25:53 UTC
  • mfrom: (102.1.9 qtubuntu-media)
  • Revision ID: ci-train-bot@canonical.com-20160322192553-3bt4fg0qlhxmwanw
Only use the new QAudio based audio role type. No need for the old QMediaPlayer audio role type. Fixes: #1534776
Approved by: Alfonso Sanchez-Beato

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit/service.cpp
15
15
 */
16
16
 
17
17
#include "service.h"
 
18
#include "player.h"
 
19
 
 
20
#include <core/media/player.h>
 
21
 
 
22
#include <memory>
18
23
 
19
24
namespace core {
20
25
namespace ubuntu {
22
27
 
23
28
const std::shared_ptr<media::Service> TestService::Client::instance()
24
29
{
25
 
    return NULL;
 
30
    return std::make_shared<TestService>();
26
31
}
27
32
 
28
33
std::shared_ptr<Player> TestService::create_session(const Player::Configuration&)
29
34
{
30
 
    return NULL;
 
35
    return std::make_shared<TestPlayer>();
31
36
}
32
37
 
33
38
void TestService::detach_session(const std::string&, const Player::Configuration&)