[Merge] lp:~phablet-team/media-hub/bg-playlist-fixes into lp:media-hub/stable

[Jim Hodapp]

Review: Needs Fixing

Looks good, one minor change still needed.

Diff comments:

> === modified file 'src/core/media/mpris/service.h'
> --- src/core/media/mpris/service.h	2015-09-08 20:03:56 +0000
> +++ src/core/media/mpris/service.h	2015-11-03 07:43:10 +0000
> @@ -107,6 +107,18 @@
>                  return s;
>              }
>          };
> +
> +        struct PlayerKeyNotFound
> +        {
> +            static const std::string& name()
> +            {
> +                static const std::string s
> +                {
> +                    "core.ubuntu.media.Service.Error.SettingCurrentPlayer"

Still need to change this to reflect the struct's name change.

> +                };
> +                return s;
> +            }
> +        };
>      };
>  
>      DBUS_CPP_METHOD_WITH_TIMEOUT_DEF(CreateSession, Service, 1000)


-- 
https://code.launchpad.net/~phablet-team/media-hub/bg-playlist-fixes/+merge/276094
Your team Ubuntu Phablet Team is subscribed to branch lp:media-hub/stable.