[Merge] lp:~justinmcp/media-hub/proxy-player into lp:media-hub

[Justin McPherson]

Diff comments:

> === modified file 'include/core/media/player.h'
> --- include/core/media/player.h	2016-04-06 15:42:15 +0000
> +++ include/core/media/player.h	2016-05-25 07:13:49 +0000
> @@ -130,6 +131,12 @@
>          service_missing_error
>      };
>  
> +    enum PlayerType
> +    {
> +        rigged,

'default' is a keyword. How about 'standard'?

> +        proxy
> +    };
> +
>      Player(const Player&) = delete;
>      virtual ~Player();
>  


-- 
https://code.launchpad.net/~justinmcp/media-hub/proxy-player/+merge/268862
Your team Ubuntu Phablet Team is subscribed to branch lp:media-hub.