[longomatch] Try with an IMultiPlayer and fallback to an IPlayer

[Andoni Morales Alastruey <amorales src gnome org>]

commit dc5308e7c966c011a83f26d43584ae59f49ea588
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Thu Mar 26 18:12:34 2015 +0100

    Try with an IMultiPlayer and fallback to an IPlayer

 LongoMatch.Services/Services/PlayerController.cs |   16 ++++++----------
 Tests/Services/TestPlayerController.cs           |    6 ++++--
 2 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/LongoMatch.Services/Services/PlayerController.cs 
b/LongoMatch.Services/Services/PlayerController.cs
index 08e03da..338b1ae 100644
--- a/LongoMatch.Services/Services/PlayerController.cs
+++ b/LongoMatch.Services/Services/PlayerController.cs
@@ -78,7 +78,7 @@ namespace LongoMatch.Services
 
                #region Constructors
 
-               public PlayerController (bool supportsMultipleStreams = false)
+               public PlayerController ()
                {
                        seeker = new Seeker ();
                        seeker.SeekEvent += HandleSeekEvent;
@@ -91,7 +91,7 @@ namespace LongoMatch.Services
                        timer = new Timer (HandleTimeout);
                        TimerDisposed = new ManualResetEvent (false);
                        ready = false;
-                       CreatePlayer (supportsMultipleStreams);
+                       CreatePlayer ();
                }
 
                #endregion
@@ -798,16 +798,12 @@ namespace LongoMatch.Services
                /// <summary>
                /// Creates the backend video player.
                /// </summary>
-               void CreatePlayer (bool supportsMultipleStreams)
+               void CreatePlayer ()
                {
-                       if (supportsMultipleStreams) {
-                               player = multiPlayer = Config.MultimediaToolkit.GetMultiPlayer ();
-                               if (player == null) {
-                                       throw new Exception ("A player that supports multiple cameras was not 
found");
-                               }
-                       } else {
+                       player = multiPlayer = Config.MultimediaToolkit.GetMultiPlayer ();
+                       if (player == null) {
+                               Log.Error ("Player with support for multiple cameras not found");
                                player = Config.MultimediaToolkit.GetPlayer ();
-                               multiPlayer = null;
                        }
                        player.Error += HandleError;
                        player.StateChange += HandleStateChange;
diff --git a/Tests/Services/TestPlayerController.cs b/Tests/Services/TestPlayerController.cs
index 22349eb..866cb2e 100644
--- a/Tests/Services/TestPlayerController.cs
+++ b/Tests/Services/TestPlayerController.cs
@@ -52,8 +52,10 @@ namespace Tests.Services
                        playerMock.Setup (p => p.Play ()).Raises (p => p.StateChange += null, true);
                        playerMock.Setup (p => p.Pause ()).Raises (p => p.StateChange += null, false);
 
-                       var mtk = Mock.Of<IMultimediaToolkit> (m => m.GetPlayer () == playerMock.Object);
-                       Config.MultimediaToolkit = mtk;
+                       var mtk = new Mock<IMultimediaToolkit> ();
+                       mtk.Setup (m => m.GetPlayer ()).Returns (playerMock.Object);
+                       mtk.Setup (m => m.GetMultiPlayer ());
+                       Config.MultimediaToolkit = mtk.Object;
 
                        var ftk = new Mock<IGUIToolkit> ();
                        ftk.Setup (m => m.Invoke (It.IsAny<EventHandler> ())).Callback<EventHandler> (e => e 
(null, null));