Finalisation de la récupération de la fin de lecture de playlist pour le lecteur streaming générique.

src/Muzich/CoreBundle/Resources/public/js/play2.js

@@ -1,4 +1,3 @@
-
 function DynamicPlayer()
 {
   
@@ -33,257 +32,6 @@ function DynamicPlayer()
   
 }
 
-function YoutubePlayer(ref_id, object_for_player)
-{
-  var _ref_id = ref_id;
-  var _object_for_player = object_for_player;
-  var _yt_player;
-  
-  this.play = function()
-  { 
-    create_player();
-  }
-  
-  var create_player = function()
-  {
-    var div_for_iframe = $('<div>').attr('id', _object_for_player.attr('id')+'_iframe');
-    _object_for_player.append(div_for_iframe);
-    
-    _yt_player = new YT.Player(_object_for_player.attr('id')+'_iframe', {
-      height  : config_player_youtube_height,
-      width   : config_player_youtube_width,
-      videoId : _ref_id,
-      events  : {
-        'onReady': onPlayerReady,
-        'onStateChange': onPlayerStateChange
-      }
-    });
-    
-    
-  }
-  
-  var onPlayerReady = function(event)
-  {
-    _yt_player.playVideo();
-  }
-  
-  var onPlayerStateChange = function(event)
-  {
-    if (event.data == YT.PlayerState.PLAYING)
-    {
-      
-    }
-    if (event.data == YT.PlayerState.ENDED)
-    {
-      
-    }
-    if (event.data == YT.PlayerState.PAUSED)
-    {
-      
-    }
-    if (event.data == YT.PlayerState.BUFFERING)
-    {
-      
-    }
-    if (event.data == YT.PlayerState.CUED)
-    {
-      
-    }
-  }
-  
-  this.pause = function()
-  {
-    _yt_player.pauseVideo();
-  }
-  
-  this.stop = function()
-  {
-    _yt_player.stopVideo();
-    _object_for_player.html('');
-  }
-}
-
-function GenericPlayer(ref_id, object_for_player)
-{
-  var _ref_id = ref_id;
-  var _object_for_player = object_for_player;
-  
-  this.play = function()
-  {
-    JQueryJson(url_get_embed_for_element+'/'+_ref_id, {}, function(response){
-      if (response.status == 'success')
-      {
-        object_for_player.html(response.data);
-      }
-    });
-  }
-  
-  this.stop = function()
-  {
-    _object_for_player.html('');
-  }
-}
-
-function SoundCloudPlayer(ref_id, object_for_player)
-{
-  var _ref_id = ref_id;
-  var _object_for_player = object_for_player;
-  var _player = null;
-  var _sounds_count = 0;
-  var _current_sound_index = 0;
-  
-  this.play = function()
-  {
-    if (!_player)
-    {
-      createPlayer();
-    }
-  }
-  
-  var createPlayer = function()
-  {
-    var div_for_iframe = $('<div>').attr('id', _object_for_player.attr('id')+'_iframe');
-    _object_for_player.append(div_for_iframe);
-    
-    SC.initialize({
-      client_id: '39946ea18e3d78d64c0ac95a025794e1'
-    });
-    
-    SC.oEmbed(_ref_id, {
-      show_artwork: false
-    }, function(oembed){
-      _object_for_player.html(oembed.html)
-      var iframe = _object_for_player.find('iframe')[0];
-      _player = SC.Widget(iframe);
-      _player.bind(SC.Widget.Events.READY, event_ready);
-      _player.bind(SC.Widget.Events.PLAY, event_play);
-      _player.bind(SC.Widget.Events.FINISH, event_finish);
-    });
-    
-    var event_ready = function()
-    {
-      console.log('sc ready');
-      _player.play();
-      _player.getSounds(function(value){
-        _sounds_count = value.length;
-      });
-    }
-    
-    var event_play = function()
-    {
-      console.log('sc play');
-      _player.getSounds(function(value){
-        _sounds_count = value.length;
-      });
-      _player.getCurrentSoundIndex(function(value){
-        _current_sound_index = value;
-      });
-    }
-    
-    var event_finish = function()
-    {
-      if (_sounds_count == _current_sound_index+1)
-      {
-        event_finish_playlist();
-      }
-    }
-    
-    var event_finish_playlist = function()
-    {
-      // Fin de lecture
-    }
-    
-  }
-}
-
-function GenericSong(title, mp3)
-{
-  this.title = title;
-  this.mp3   = mp3;
-}
-
-function JamendoPlayer(ref_id, object_for_player)
-{
-  var _ref_id = ref_id;
-  var _object_for_player = object_for_player;
-  var _playlist = new Array();
-  
-  this.play = function()
-  {
-    create_player();
-  }
-  
-  var create_player = function()
-  {
-    // TODO efactoriser dans un objet lecteur generique
-    var jplayer_player  = $('#jquery_jplayer_1').clone();
-    var jplayer_content = $('#jp_container_1').clone();
-    
-    jplayer_player.attr ('id', 'jplayer_player_element_'+ref_id);
-    jplayer_content.attr('id', 'jplayer_content_element_'+ref_id);
-    
-    _object_for_player.html('');
-    _object_for_player.append(jplayer_player);
-    _object_for_player.append(jplayer_content);
-    
-    JQueryJson(url_element_get_stream_data+'/'+ref_id, {}, function(response){
-      if (response.status == 'success')
-      {
-        
-        for(var i = 0; i < response.data.length; i++)
-        {
-          var song = new GenericSong(response.data[i].name, response.data[i].url);
-          _playlist[i] = song;
-        }
-        
-        autoplay_generic_player_playlist = new jPlayerPlaylist
-        (
-          {
-            jPlayer: '#jplayer_player_element_'+ref_id,
-            cssSelectorAncestor: '#jplayer_content_element_'+ref_id
-          },
-          _playlist,
-          {
-            playlistOptions:
-            {
-              autoPlay: true,
-              enableRemoveControls: true
-            },
-            swfPath: "/jplayer/js",
-            supplied: "mp3",
-            wmode: "window"
-          }
-        );
-        
-        $('#jplayer_player_element_'+ref_id).bind($.jPlayer.event.play, event_play);
-        $('#jplayer_player_element_'+ref_id).bind($.jPlayer.event.ended, event_end);
-        $('#jplayer_player_element_'+ref_id).bind($.jPlayer.event.error, event_error);
-        
-      }
-    });
-  }
-  
-  var event_play = function(event)
-  {
-    
-  }
-  
-  var event_end = function(event)
-  {
-    
-  }
-  
-  var event_error = function(event)
-  {
-    
-  }
-  
-  this.stop = function()
-  {
-    
-  }
-}
-
 function PlayersManager()
 {
   var _players = new Array();

src/Muzich/CoreBundle/Resources/public/js/player/GenericPlayer.js

@@ -0,0 +1,20 @@
+function GenericPlayer(ref_id, object_for_player)
+{
+  var _ref_id = ref_id;
+  var _object_for_player = object_for_player;
+  
+  this.play = function()
+  {
+    JQueryJson(url_get_embed_for_element+'/'+_ref_id, {}, function(response){
+      if (response.status == 'success')
+      {
+        object_for_player.html(response.data);
+      }
+    });
+  }
+  
+  this.stop = function()
+  {
+    _object_for_player.html('');
+  }
+}

src/Muzich/CoreBundle/Resources/public/js/player/GenericStreamingPlayer.js

@@ -0,0 +1,116 @@
+function GenericStreamingPlayer(ref_id, object_for_player,
+  callback_event_play,
+  callback_event_end,
+  callback_event_error,
+  callback_event_finish_playlist
+)
+{
+  var _ref_id = ref_id;
+  var _object_for_player = object_for_player;
+  var _playlist = new Array();
+  var _player = null;
+  
+  var _callback_event_play = callback_event_play;
+  var _callback_event_end = callback_event_end;
+  var _callback_event_error = callback_event_error;
+  var _callback_event_finish_playlist = callback_event_finish_playlist;
+  
+  var _current_index = 0;
+  
+  this.create_player = function()
+  {
+    var jplayer_player  = $('#jquery_jplayer_1').clone();
+    var jplayer_content = $('#jp_container_1').clone();
+    
+    jplayer_player.attr ('id', 'jplayer_player_element_'+ref_id);
+    jplayer_content.attr('id', 'jplayer_content_element_'+ref_id);
+    
+    _object_for_player.html('');
+    _object_for_player.append(jplayer_player);
+    _object_for_player.append(jplayer_content);
+    
+    JQueryJson(url_element_get_stream_data+'/'+ref_id, {}, function(response){
+      if (response.status == 'success')
+      {
+        
+        for(var i = 0; i < response.data.length; i++)
+        {
+          var song = new GenericSong(response.data[i].name, response.data[i].url);
+          _playlist[i] = song;
+        }
+        
+        _player = new jPlayerPlaylist
+        (
+          {
+            jPlayer: '#jplayer_player_element_'+ref_id,
+            cssSelectorAncestor: '#jplayer_content_element_'+ref_id
+          },
+          _playlist,
+          {
+            playlistOptions:
+            {
+              autoPlay: true,
+              enableRemoveControls: true
+            },
+            swfPath: "/jplayer/js",
+            supplied: "mp3",
+            wmode: "window"
+          }
+        );
+        
+        var player = $('#jplayer_player_element_'+ref_id);
+        player.bind($.jPlayer.event.play, event_play);
+        player.bind($.jPlayer.event.ended, event_end);
+        player.bind($.jPlayer.event.error, event_error);
+        
+      }
+    });
+  }
+  
+  var event_play = function(event)
+  {
+    _current_index = _player.current;
+  
+    _callback_event_play(event);
+  }
+  
+  var event_end = function(event)
+  {
+    _callback_event_end(event);
+    if (_current_index+1 == _playlist.length)
+    {
+      event_finish_playlist(event);
+    }
+  }
+  
+  var event_error = function(event)
+  {
+    _callback_event_error(event);
+  }
+  
+  var event_finish_playlist = function(event)
+  {
+    _callback_event_finish_playlist(event);
+  }
+  
+  this.play = function()
+  {
+    _player.jPlayer("play");
+  }
+  
+  this.stop = function()
+  {
+    _player.jPlayer("stop");
+  }
+  
+  this.pause = function()
+  {
+    _player.jPlayer("pause");
+  }
+}
+
+function GenericSong(title, mp3)
+{
+  this.title = title;
+  this.mp3   = mp3;
+}

src/Muzich/CoreBundle/Resources/public/js/player/JamendoPlayer.js

@@ -0,0 +1,47 @@
+function JamendoPlayer(ref_id, object_for_player)
+{
+  var _ref_id = ref_id;
+  var _object_for_player = object_for_player;
+  var _player = null;
+  
+  this.play = function()
+  {
+    _player = new GenericStreamingPlayer(_ref_id, _object_for_player,
+      event_play,
+      event_end,
+      event_error,
+      event_finish_playlist);
+    _player.create_player();
+  }
+  
+  var event_play = function()
+  {
+    
+  }
+  
+  var event_end = function()
+  {
+    
+  }
+  
+  var event_error = function()
+  {
+    
+  }
+  
+  var event_finish_playlist = function()
+  {
+    
+  }
+  
+  this.stop = function()
+  {
+    _player.stop();
+  }
+  
+  this.pause = function()
+  {
+    _player.pause();
+  }
+  
+}

src/Muzich/CoreBundle/Resources/public/js/player/SoundCloudPlayer.js

@@ -0,0 +1,71 @@
+function SoundCloudPlayer(ref_id, object_for_player)
+{
+  var _ref_id = ref_id;
+  var _object_for_player = object_for_player;
+  var _player = null;
+  var _sounds_count = 0;
+  var _current_sound_index = 0;
+  
+  this.play = function()
+  {
+    if (!_player)
+    {
+      createPlayer();
+    }
+  }
+  
+  var createPlayer = function()
+  {
+    var div_for_iframe = $('<div>').attr('id', _object_for_player.attr('id')+'_iframe');
+    _object_for_player.append(div_for_iframe);
+    
+    SC.initialize({
+      client_id: '39946ea18e3d78d64c0ac95a025794e1'
+    });
+    
+    SC.oEmbed(_ref_id, {
+      show_artwork: false
+    }, function(oembed){
+      _object_for_player.html(oembed.html)
+      var iframe = _object_for_player.find('iframe')[0];
+      _player = SC.Widget(iframe);
+      _player.bind(SC.Widget.Events.READY, event_ready);
+      _player.bind(SC.Widget.Events.PLAY, event_play);
+      _player.bind(SC.Widget.Events.FINISH, event_finish);
+    });
+    
+    var event_ready = function()
+    {
+      console.log('sc ready');
+      _player.play();
+      _player.getSounds(function(value){
+        _sounds_count = value.length;
+      });
+    }
+    
+    var event_play = function()
+    {
+      console.log('sc play');
+      _player.getSounds(function(value){
+        _sounds_count = value.length;
+      });
+      _player.getCurrentSoundIndex(function(value){
+        _current_sound_index = value;
+      });
+    }
+    
+    var event_finish = function()
+    {
+      if (_sounds_count == _current_sound_index+1)
+      {
+        event_finish_playlist();
+      }
+    }
+    
+    var event_finish_playlist = function()
+    {
+      // Fin de lecture
+    }
+    
+  }
+}

src/Muzich/CoreBundle/Resources/public/js/player/YoutubePlayer.js

@@ -0,0 +1,69 @@
+function YoutubePlayer(ref_id, object_for_player)
+{
+  var _ref_id = ref_id;
+  var _object_for_player = object_for_player;
+  var _yt_player;
+  
+  this.play = function()
+  { 
+    create_player();
+  }
+  
+  var create_player = function()
+  {
+    var div_for_iframe = $('<div>').attr('id', _object_for_player.attr('id')+'_iframe');
+    _object_for_player.append(div_for_iframe);
+    
+    _yt_player = new YT.Player(_object_for_player.attr('id')+'_iframe', {
+      height  : config_player_youtube_height,
+      width   : config_player_youtube_width,
+      videoId : _ref_id,
+      events  : {
+        'onReady': onPlayerReady,
+        'onStateChange': onPlayerStateChange
+      }
+    });
+    
+    
+  }
+  
+  var onPlayerReady = function(event)
+  {
+    _yt_player.playVideo();
+  }
+  
+  var onPlayerStateChange = function(event)
+  {
+    if (event.data == YT.PlayerState.PLAYING)
+    {
+      
+    }
+    if (event.data == YT.PlayerState.ENDED)
+    {
+      
+    }
+    if (event.data == YT.PlayerState.PAUSED)
+    {
+      
+    }
+    if (event.data == YT.PlayerState.BUFFERING)
+    {
+      
+    }
+    if (event.data == YT.PlayerState.CUED)
+    {
+      
+    }
+  }
+  
+  this.pause = function()
+  {
+    _yt_player.pauseVideo();
+  }
+  
+  this.stop = function()
+  {
+    _yt_player.stopVideo();
+    _object_for_player.html('');
+  }
+}

src/Muzich/CoreBundle/Resources/views/Layout/head_js.html.twig

@@ -11,6 +11,7 @@
   '@MuzichCoreBundle/Resources/public/js/TagPrompt.js'
   '@MuzichCoreBundle/Resources/public/js/play.js'
   '@MuzichCoreBundle/Resources/public/js/play2.js'
+  '@MuzichCoreBundle/Resources/public/js/player/*'
   '@MuzichCoreBundle/Resources/public/js/muzich.js' %}{# filter='yui_js' %}#}
   <script src="{{ asset_url }}"></script>
 {% endjavascripts %}

web/jplayer/skin/blue.monday/jplayer.blue.monday.css

@@ -31,7 +31,7 @@ div.jp-video {
 	background-color:#eee;
 }
 div.jp-audio {
-	width:500px;
+	width:100%;
 }
 div.jp-audio-stream {
 	width:182px;