diff -r 1c68ad1ea60f -r c9c34daf1fe6 crea/integration/metadataplayer/MusitagAnnotations.js --- a/crea/integration/metadataplayer/MusitagAnnotations.js Mon Jun 11 17:59:51 2012 +0200 +++ b/crea/integration/metadataplayer/MusitagAnnotations.js Mon Jun 11 18:55:50 2012 +0200 @@ -58,9 +58,6 @@ height: 1, provider: "rtmp", events: { - onPlay: function() { - _this.setPlayState(true); - }, onPause: function() { _this.setPlayState(false); }, @@ -70,16 +67,20 @@ } }); this.current_audio = false; - this.playing = false; + this.annotation_playing = false; + this.media_playing = !this.player.popcorn.media.paused; this.redraw(); } IriSP.Widgets.MusitagAnnotations.prototype.setPlayState = function(_playState) { - this.playing = _playState; + this.annotation_playing = _playState; if (_playState) { this.$main.find(".Musitag-Annotations-Balloon").addClass("pause"); } else { this.$main.find(".Musitag-Annotations-Balloon").removeClass("pause"); + if (this.media_playing) { + this.player.popcorn.play(); + } } } @@ -136,13 +137,17 @@ this.$main.find('.Musitag-Annotations-Balloon').click(function() { var _el = IriSP.jQuery(this), _audiofile = _el.attr("audio-url").replace(_this.rtmp_streamer,""); - if (_this.playing) { + if (_this.annotation_playing) { _this.jwplayer.pause(); _this.loadAudio(_audiofile); } else { _this.loadAudio(_audiofile); _this.jwplayer.play(); _this.setPlayState(true); + _this.media_playing = !_this.player.popcorn.media.paused; + if (_this.media_playing) { + _this.player.popcorn.pause(); + } } }); }