[Merge] lp:~lorn-potter/qtubuntu-media/add-buffering_changed into lp:qtubuntu-media

[Jim Hodapp]

Review: Needs Fixing

Just a couple of fixes left.

Diff comments:

> 
> === modified file 'tests/unit/player.cpp'
> --- tests/unit/player.cpp	2016-03-17 19:44:54 +0000
> +++ tests/unit/player.cpp	2016-06-09 18:34:52 +0000
> @@ -311,6 +311,12 @@
>      return ret;
>  }
>  
> +const core::Signal<int>& TestPlayer::buffering_changed() const
> +{
> +    static core::Signal<int> dur;

Should be static const core::Signal<int> dur;

> +    return dur;
> +}
> +
>  const std::shared_ptr<Service> Service::Client::instance()
>  {
>      return NULL;
> 
> === modified file 'tests/unit/player_mock.cpp'
> --- tests/unit/player_mock.cpp	2015-06-08 19:16:35 +0000
> +++ tests/unit/player_mock.cpp	2016-06-09 18:34:52 +0000
> @@ -308,6 +308,12 @@
>      return ret;
>  }
>  
> +const core::Signal<int>& PlayerMock::buffering_changed() const
> +{
> +    static core::Signal<int> dur;

Should be static const core::Signal<int> dur;

> +    return dur;
> +}
> +
>  }
>  }
>  }


-- 
https://code.launchpad.net/~lorn-potter/qtubuntu-media/add-buffering_changed/+merge/296731
Your team Ubuntu Phablet Team is subscribed to branch lp:qtubuntu-media.