diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 1ca7d2bff..bdb8c5273 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -1,365 +1,363 @@
-var MediaPlayer = (function (document) {
+var MediaPlayer = (function (document, clearTimeout, screen, localStorage, _V_, $) {
 
     var testableAudioElement = document.createElement('audio');
     var testableVideoElement = document.createElement('video');
     var currentMediaElement;
-    
-    return {
-        
-        canPlay: function (item) {
+    var currentProgressInterval;
 
-            if (item.MediaType === "Video") {
+    function playAudio(items, params) {
+        var item = items[0];
 
-                var media = testableVideoElement;
+        var baseParams = {
+            audioChannels: 2,
+            audioBitrate: 128000
+        };
 
-                if (media.canPlayType) {
+        $.extend(baseParams, params);
 
-                    return media.canPlayType('video/mp4').replace(/no/, '') || media.canPlayType('video/mp2t').replace(/no/, '') || media.canPlayType('video/webm').replace(/no/, '') || media.canPlayType('application/x-mpegURL').replace(/no/, '') || media.canPlayType('video/ogv').replace(/no/, '');
+        var mp3Url = ApiClient.getUrl('Audio/' + item.Id + '/stream.mp3', $.extend({}, baseParams, {
+            audioCodec: 'mp3'
+        }));
+
+        var aacUrl = ApiClient.getUrl('Audio/' + item.Id + '/stream.aac', $.extend({}, baseParams, {
+            audioCodec: 'aac'
+        }));
+
+        var webmUrl = ApiClient.getUrl('Audio/' + item.Id + '/stream.webm', $.extend({}, baseParams, {
+            audioCodec: 'Vorbis'
+        }));
+
+        /* ffmpeg always says the ogg stream is corrupt after conversion
+         var oggUrl = ApiClient.getUrl('Audio/' + item.Id + '/stream.oga', $.extend({}, baseParams, {
+         audioCodec: 'Vorbis'
+         }));
+         */
+
+        var html = '';
+        html += '<audio class="itemAudio" preload="none" controls autoplay>';
+        html += '<source type="audio/mpeg" src="' + mp3Url + '" />';
+        html += '<source type="audio/aac" src="' + aacUrl + '" />';
+        html += '<source type="audio/webm" src="' + webmUrl + '" />';
+        //html += '<source type="audio/ogg" src="' + oggUrl + '" />';
+        html += '</audio';
+
+        var nowPlayingBar = $('#nowPlayingBar').show();
+        //show stop button
+        $('#stopButton', nowPlayingBar).show();
+
+        $('#mediaElement', nowPlayingBar).html(html);
+
+        return $('audio', nowPlayingBar)[0];
+    }
+
+    function playVideo(items, startPosition) {
+        //stop/kill videoJS
+        if (currentMediaElement) self.stop();
+
+        var item = items[0];
+
+        // Account for screen rotation. Use the larger dimension as the width.
+        var screenWidth = Math.max(screen.height, screen.width);
+        var screenHeight = Math.min(screen.height, screen.width);
+
+        var volume = localStorage.getItem("volume") || 0.5;
+        var user = Dashboard.getCurrentUser();
+        var defaults = { languageIndex: null, subtitleIndex: null };
+
+        var userConfig = user.Configuration || {};
+        if (item.MediaStreams && item.MediaStreams.length) {
+            $.each(item.MediaStreams, function (i, stream) {
+                //get default subtitle stream
+                if (stream.Type == "Subtitle") {
+                    if (userConfig.UseForcedSubtitlesOnly == true && userConfig.SubtitleLanguagePreference && !defaults.subtitleIndex) {
+                        if (stream.Language == userConfig.SubtitleLanguagePreference && stream.IsForced == true) {
+                            defaults.subtitleIndex = i;
+                        }
+                    } else if (userConfig.SubtitleLanguagePreference && !defaults.subtitleIndex) {
+                        if (stream.Language == userConfig.SubtitleLanguagePreference) {
+                            defaults.subtitleIndex = i;
+                        }
+                    } else if (userConfig.UseForcedSubtitlesOnly == true && !defaults.subtitleIndex) {
+                        if (stream.IsForced == true) {
+                            defaults.subtitleIndex = i;
+                        }
+                    }
+                } else if (stream.Type == "Audio") {
+                    //get default language stream
+                    if (userConfig.AudioLanguagePreference && !defaults.languageIndex) {
+                        if (stream.Language == userConfig.AudioLanguagePreference) {
+                            defaults.languageIndex = i;
+                        }
+                    }
                 }
+            });
+        }
 
-                return false;
-            }
+        var baseParams = {
+            audioChannels: 2,
+            audioBitrate: 128000,
+            videoBitrate: 1500000,
+            maxWidth: screenWidth,
+            maxHeight: screenHeight,
+            StartTimeTicks: 0,
+            SubtitleStreamIndex: null,
+            AudioStreamIndex: null
+        };
 
-            if (item.MediaType === "Audio") {
+        if (typeof (startPosition) != "undefined") {
+            baseParams['StartTimeTicks'] = startPosition;
+        }
 
-                var media = testableAudioElement;
+        var html = '<video id="videoWindow" class="itemVideo video-js vjs-default-skin"></video>';
 
-                if (media.canPlayType) {
+        var nowPlayingBar = $('#nowPlayingBar');
+        //hide stop button
+        $('#stopButton', nowPlayingBar).hide();
 
-                    return media.canPlayType('audio/mpeg').replace(/no/, '') || media.canPlayType('audio/webm').replace(/no/, '') || media.canPlayType('audio/aac').replace(/no/, '') || media.canPlayType('audio/ogg').replace(/no/, '');
-                }
+        $('#mediaElement', nowPlayingBar).addClass("video").html(html).show();
 
-                return false;
-            }
+        _V_("videoWindow", { 'controls': true, 'autoplay': true, 'preload': 'auto' }, function () {
 
-            return false;
-        },
-
-        play: function (items, startPosition) {
-
-            if (MediaPlayer.isPlaying()) {
-                MediaPlayer.stop();
-            }
-
-            var item = items[0];
-
-            var mediaElement;
-
-            if (item.MediaType === "Video") {
-
-                mediaElement = MediaPlayer.playVideo(items, startPosition);
-            }
-
-            else if (item.MediaType === "Audio") {
-
-                mediaElement = MediaPlayer.playAudio(items);
-            }
-
-            if (!mediaElement) {
-                return;
-            }
-
-            currentMediaElement = mediaElement;
-
-            var nowPlayingBar = $('#nowPlayingBar').show();
-
-            if (items.length > 1) {
-                $('#previousTrackButton', nowPlayingBar)[0].disabled = false;
-                $('#nextTrackButton', nowPlayingBar)[0].disabled = false;
-            } else {
-                $('#previousTrackButton', nowPlayingBar)[0].disabled = true;
-                $('#nextTrackButton', nowPlayingBar)[0].disabled = true;
-            }
-
-            //display image and title
-            var imageTags = item.ImageTags || {};
-            var html = '';
-
-            var url = "";
-
-            if (item.BackdropImageTags && item.BackdropImageTags.length) {
-
-                url = ApiClient.getImageUrl(item.Id, {
-                    type: "Backdrop",
-                    height: 36,
-                    tag: item.BackdropImageTags[0]
-                });
-            }
-            else if (imageTags.Thumb) {
-
-                url = ApiClient.getImageUrl(item.Id, {
-                    type: "Thumb",
-                    height: 36,
-                    tag: item.ImageTags.Thumb
-                });
-            }
-            else if (imageTags.Primary) {
-
-                url = ApiClient.getImageUrl(item.Id, {
-                    type: "Primary",
-                    height: 36,
-                    tag: item.ImageTags.Primary
-                });
-            } else {
-                url = "css/images/items/detail/video.png";
-            }
-
-            var name = item.Name;
-            var series_name = '';
-
-            if (item.IndexNumber != null) {
-                name = item.IndexNumber + " - " + name;
-            }
-            if (item.ParentIndexNumber != null) {
-                name = item.ParentIndexNumber + "." + name;
-            }
-            if (item.SeriesName || item.Album || item.ProductionYear) {
-                series_name = item.SeriesName || item.Album || item.ProductionYear;
-            }
-
-            html += "<div><img class='nowPlayingBarImage ' alt='' title='' src='" + url + "' style='height:36px;display:inline-block;' /></div>";
-            if (item.Type == "Movie")
-                html += '<div>' + name + '<br/>' + series_name + '</div>';
-            else
-                html += '<div>' + series_name + '<br/>' + name + '</div>';
-
-            $('#mediaInfo', nowPlayingBar).html(html);
-        },
-
-        playAudio: function (items, params) {
-            var item = items[0];
-
-            var baseParams = {
-                audioChannels: 2,
-                audioBitrate: 128000
-            };
-
-            $.extend(baseParams, params);
-
-            var mp3Url = ApiClient.getUrl('Audio/' + item.Id + '/stream.mp3', $.extend({}, baseParams, {
-                audioCodec: 'mp3'
-            }));
-
-            var aacUrl = ApiClient.getUrl('Audio/' + item.Id + '/stream.aac', $.extend({}, baseParams, {
+            var mp4VideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.mp4', $.extend({}, baseParams, {
+                videoCodec: 'h264',
                 audioCodec: 'aac'
             }));
 
-            var webmUrl = ApiClient.getUrl('Audio/' + item.Id + '/stream.webm', $.extend({}, baseParams, {
+            var tsVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.ts', $.extend({}, baseParams, {
+                videoCodec: 'h264',
+                audioCodec: 'aac'
+            }));
+
+            var webmVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.webm', $.extend({}, baseParams, {
+                videoCodec: 'vpx',
                 audioCodec: 'Vorbis'
             }));
 
-            /* ffmpeg always says the ogg stream is corrupt after conversion
-             var oggUrl = ApiClient.getUrl('Audio/' + item.Id + '/stream.oga', $.extend({}, baseParams, {
-             audioCodec: 'Vorbis'
-             }));
-             */
+            var hlsVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.m3u8', $.extend({}, baseParams, {
+                videoCodec: 'h264',
+                audioCodec: 'aac'
+            }));
 
-            var html = '';
-            html += '<audio class="itemAudio" preload="none" controls autoplay>';
-            html += '<source type="audio/mpeg" src="' + mp3Url + '" />';
-            html += '<source type="audio/aac" src="' + aacUrl + '" />';
-            html += '<source type="audio/webm" src="' + webmUrl + '" />';
-            //html += '<source type="audio/ogg" src="' + oggUrl + '" />';
-            html += '</audio';
+            var ogvVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.ogv', $.extend({}, baseParams, {
+                videoCodec: 'theora',
+                audioCodec: 'Vorbis'
+            }));
 
-            var nowPlayingBar = $('#nowPlayingBar').show();
-            //show stop button
-            $('#stopButton', nowPlayingBar).show();
+            (this).src([
+                { type: "application/x-mpegURL", src: hlsVideoUrl },
+                { type: "video/webm", src: webmVideoUrl },
+                { type: "video/mp4", src: mp4VideoUrl },
+                { type: "video/mp2t; codecs='h264, aac'", src: tsVideoUrl },
+                { type: "video/ogg", src: ogvVideoUrl }]
+            ).volume(volume);
 
-            $('#mediaElement', nowPlayingBar).html(html);
+            videoJSextension.setup_video($('#videoWindow'), item, defaults);
 
-            return $('audio', nowPlayingBar)[0];
-        },
-
-        playVideo: function (items, startPosition) {
-            //stop/kill videoJS
-            if (currentMediaElement) MediaPlayer.stop();
-
-            var item = items[0];
-
-            // Account for screen rotation. Use the larger dimension as the width.
-            var screenWidth = Math.max(screen.height, screen.width);
-            var screenHeight = Math.min(screen.height, screen.width);
-
-            var volume = localStorage.getItem("volume") || 0.5;
-            var user = Dashboard.getCurrentUser();
-            var defaults = { languageIndex: null, subtitleIndex: null };
-
-            var user_config = user.Configuration || {};
-            if (item.MediaStreams && item.MediaStreams.length) {
-                $.each(item.MediaStreams, function (i, stream) {
-                    //get default subtitle stream
-                    if (stream.Type == "Subtitle") {
-                        if (user_config.UseForcedSubtitlesOnly == true && user_config.SubtitleLanguagePreference && !defaults.subtitleIndex) {
-                            if (stream.Language == user_config.SubtitleLanguagePreference && stream.IsForced == true) {
-                                defaults.subtitleIndex = i;
-                            }
-                        } else if (user_config.SubtitleLanguagePreference && !defaults.subtitleIndex) {
-                            if (stream.Language == user_config.SubtitleLanguagePreference) {
-                                defaults.subtitleIndex = i;
-                            }
-                        } else if (user_config.UseForcedSubtitlesOnly == true && !defaults.subtitleIndex) {
-                            if (stream.IsForced == true) {
-                                defaults.subtitleIndex = i;
-                            }
-                        }
-                    } else if (stream.Type == "Audio") {
-                        //get default language stream
-                        if (user_config.AudioLanguagePreference && !defaults.languageIndex) {
-                            if (stream.Language == user_config.AudioLanguagePreference) {
-                                defaults.languageIndex = i;
-                            }
-                        }
-                    }
-                });
-            }
-
-            var baseParams = {
-                audioChannels: 2,
-                audioBitrate: 128000,
-                videoBitrate: 1500000,
-                maxWidth: screenWidth,
-                maxHeight: screenHeight,
-                StartTimeTicks: 0,
-                SubtitleStreamIndex: null,
-                AudioStreamIndex: null
-            };
-
-            if (typeof (startPosition) != "undefined") {
-                baseParams['StartTimeTicks'] = startPosition;
-            }
-
-            var html = '<video id="videoWindow" class="itemVideo video-js vjs-default-skin"></video>';
-
-            var nowPlayingBar = $('#nowPlayingBar');
-            //hide stop button
-            $('#stopButton', nowPlayingBar).hide();
-
-            $('#mediaElement', nowPlayingBar).addClass("video").html(html).show();
-
-            _V_("videoWindow", { 'controls': true, 'autoplay': true, 'preload': 'auto' }, function () {
-
-                var mp4VideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.mp4', $.extend({}, baseParams, {
-                    videoCodec: 'h264',
-                    audioCodec: 'aac'
-                }));
-
-                var tsVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.ts', $.extend({}, baseParams, {
-                    videoCodec: 'h264',
-                    audioCodec: 'aac'
-                }));
-
-                var webmVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.webm', $.extend({}, baseParams, {
-                    videoCodec: 'vpx',
-                    audioCodec: 'Vorbis'
-                }));
-
-                var hlsVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.m3u8', $.extend({}, baseParams, {
-                    videoCodec: 'h264',
-                    audioCodec: 'aac'
-                }));
-
-                var ogvVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.ogv', $.extend({}, baseParams, {
-                    videoCodec: 'theora',
-                    audioCodec: 'Vorbis'
-                }));
-
-                (this).src([
-                    { type: "application/x-mpegURL", src: hlsVideoUrl },
-                    { type: "video/webm", src: webmVideoUrl },
-                    { type: "video/mp4", src: mp4VideoUrl },
-                    { type: "video/mp2t; codecs='h264, aac'", src: tsVideoUrl },
-                    { type: "video/ogg", src: ogvVideoUrl }]
-                ).volume(volume);
-
-                videoJSextension.setup_video($('#videoWindow'), item, defaults);
-
-                (this).addEvent("loadstart", function () {
-                    $(".vjs-remaining-time-display").hide();
-                });
-
-                (this).addEvent("durationchange", function () {
-                    if ((this).duration() != "Infinity")
-                        $(".vjs-remaining-time-display").show();
-                });
-
-                (this).addEvent("volumechange", function () {
-                    localStorage.setItem("volume", (this).volume());
-                });
-
-                (this).addEvent("play", MediaPlayer.updateProgress);
-
-                ApiClient.reportPlaybackStart(Dashboard.getCurrentUserId(), item.Id);
+            (this).addEvent("loadstart", function () {
+                $(".vjs-remaining-time-display").hide();
             });
 
-            return $('video', nowPlayingBar)[0];
-        },
+            (this).addEvent("durationchange", function () {
+                if ((this).duration() != "Infinity")
+                    $(".vjs-remaining-time-display").show();
+            });
 
-        stop: function () {
+            (this).addEvent("volumechange", function () {
+                localStorage.setItem("volume", (this).volume());
+            });
 
-            var elem = currentMediaElement;
+            (this).addEvent("play", updateProgress);
 
-            //check if it's a video using VideoJS
-            if ($(elem).hasClass("vjs-tech")) {
-                var player = _V_("videoWindow");
+            ApiClient.reportPlaybackStart(Dashboard.getCurrentUserId(), item.Id);
+        });
 
-                var startTimeTicks = player.tag.src.match(new RegExp("StartTimeTicks=[0-9]+", "g"));
-                var start_time = startTimeTicks[0].replace("StartTimeTicks=", "");
+        return $('video', nowPlayingBar)[0];
+    }
 
-                var item_string = player.tag.src.match(new RegExp("Videos/[0-9a-z\-]+", "g"));
-                var item_id = item_string[0].replace("Videos/", "");
+    function updateProgress() {
+        currentProgressInterval = setInterval(function () {
+            var player = _V_("videoWindow");
 
-                var positionTicks = parseInt(start_time) + Math.floor(10000000 * player.currentTime());
+            var startTimeTicks = player.tag.src.match(new RegExp("StartTimeTicks=[0-9]+", "g"));
+            var startTime = startTimeTicks[0].replace("StartTimeTicks=", "");
 
-                ApiClient.reportPlaybackStopped(Dashboard.getCurrentUserId(), item_id, positionTicks);
+            var itemString = player.tag.src.match(new RegExp("Videos/[0-9a-z\-]+", "g"));
+            var itemId = itemString[0].replace("Videos/", "");
 
-                clearTimeout(MediaPlayer.progressInterval);
+            var positionTicks = parseInt(startTime) + Math.floor(10000000 * player.currentTime());
 
-                if (player.techName == "html5") {
-                    player.tag.src = "";
-                    player.tech.removeTriggers();
-                    player.load();
-                }
+            ApiClient.reportPlaybackProgress(Dashboard.getCurrentUserId(), itemId, positionTicks);
+        }, 30000);
+    }
 
-                //remove custom buttons
-                delete _V_.ControlBar.prototype.options.components.ResolutionSelectorButton;
-                delete _V_.ControlBar.prototype.options.components.SubtitleSelectorButton;
-                delete _V_.ControlBar.prototype.options.components.LanguageSelectorButton;
-                delete _V_.ControlBar.prototype.options.components.ChapterSelectorButton;
+    self.canPlay = function (item) {
 
-                //player.tech.destroy();
-                player.destroy();
-            } else {
-                elem.pause();
-                elem.src = "";
+        if (item.MediaType === "Video") {
+
+            var media = testableVideoElement;
+
+            if (media.canPlayType) {
+
+                return media.canPlayType('video/mp4').replace(/no/, '') || media.canPlayType('video/mp2t').replace(/no/, '') || media.canPlayType('video/webm').replace(/no/, '') || media.canPlayType('application/x-mpegURL').replace(/no/, '') || media.canPlayType('video/ogv').replace(/no/, '');
             }
 
-            $(elem).remove();
-
-            $('#nowPlayingBar').hide();
-
-            currentMediaElement = null;
-        },
-
-        isPlaying: function () {
-            return currentMediaElement;
-        },
-
-        updateProgress: function () {
-            MediaPlayer.progressInterval = setInterval(function () {
-                var player = _V_("videoWindow");
-
-                var startTimeTicks = player.tag.src.match(new RegExp("StartTimeTicks=[0-9]+", "g"));
-                var start_time = startTimeTicks[0].replace("StartTimeTicks=", "");
-
-                var item_string = player.tag.src.match(new RegExp("Videos/[0-9a-z\-]+", "g"));
-                var item_id = item_string[0].replace("Videos/", "");
-
-                var positionTicks = parseInt(start_time) + Math.floor(10000000 * player.currentTime());
-
-                ApiClient.reportPlaybackProgress(Dashboard.getCurrentUserId(), item_id, positionTicks);
-            }, 30000);
+            return false;
         }
+
+        if (item.MediaType === "Audio") {
+
+            var media = testableAudioElement;
+
+            if (media.canPlayType) {
+
+                return media.canPlayType('audio/mpeg').replace(/no/, '') || media.canPlayType('audio/webm').replace(/no/, '') || media.canPlayType('audio/aac').replace(/no/, '') || media.canPlayType('audio/ogg').replace(/no/, '');
+            }
+
+            return false;
+        }
+
+        return false;
     };
 
-})(document);
\ No newline at end of file
+    self.play = function (items, startPosition) {
+
+        if (self.isPlaying()) {
+            self.stop();
+        }
+
+        var item = items[0];
+
+        var mediaElement;
+
+        if (item.MediaType === "Video") {
+
+            mediaElement = playVideo(items, startPosition);
+        } else if (item.MediaType === "Audio") {
+
+            mediaElement = playAudio(items);
+        }
+
+        if (!mediaElement) {
+            return;
+        }
+
+        currentMediaElement = mediaElement;
+
+        var nowPlayingBar = $('#nowPlayingBar').show();
+
+        if (items.length > 1) {
+            $('#previousTrackButton', nowPlayingBar)[0].disabled = false;
+            $('#nextTrackButton', nowPlayingBar)[0].disabled = false;
+        } else {
+            $('#previousTrackButton', nowPlayingBar)[0].disabled = true;
+            $('#nextTrackButton', nowPlayingBar)[0].disabled = true;
+        }
+
+        //display image and title
+        var imageTags = item.ImageTags || {};
+        var html = '';
+
+        var url = "";
+
+        if (item.BackdropImageTags && item.BackdropImageTags.length) {
+
+            url = ApiClient.getImageUrl(item.Id, {
+                type: "Backdrop",
+                height: 36,
+                tag: item.BackdropImageTags[0]
+            });
+        } else if (imageTags.Thumb) {
+
+            url = ApiClient.getImageUrl(item.Id, {
+                type: "Thumb",
+                height: 36,
+                tag: item.ImageTags.Thumb
+            });
+        } else if (imageTags.Primary) {
+
+            url = ApiClient.getImageUrl(item.Id, {
+                type: "Primary",
+                height: 36,
+                tag: item.ImageTags.Primary
+            });
+        } else {
+            url = "css/images/items/detail/video.png";
+        }
+
+        var name = item.Name;
+        var seriesName = '';
+
+        if (item.IndexNumber != null) {
+            name = item.IndexNumber + " - " + name;
+        }
+        if (item.ParentIndexNumber != null) {
+            name = item.ParentIndexNumber + "." + name;
+        }
+        if (item.SeriesName || item.Album || item.ProductionYear) {
+            seriesName = item.SeriesName || item.Album || item.ProductionYear;
+        }
+
+        html += "<div><img class='nowPlayingBarImage ' alt='' title='' src='" + url + "' style='height:36px;display:inline-block;' /></div>";
+        if (item.Type == "Movie")
+            html += '<div>' + name + '<br/>' + seriesName + '</div>';
+        else
+            html += '<div>' + seriesName + '<br/>' + name + '</div>';
+
+        $('#mediaInfo', nowPlayingBar).html(html);
+    };
+
+    self.stop = function () {
+
+        var elem = currentMediaElement;
+
+        //check if it's a video using VideoJS
+        if ($(elem).hasClass("vjs-tech")) {
+            var player = _V_("videoWindow");
+
+            var startTimeTicks = player.tag.src.match(new RegExp("StartTimeTicks=[0-9]+", "g"));
+            var startTime = startTimeTicks[0].replace("StartTimeTicks=", "");
+
+            var itemString = player.tag.src.match(new RegExp("Videos/[0-9a-z\-]+", "g"));
+            var itemId = itemString[0].replace("Videos/", "");
+
+            var positionTicks = parseInt(startTime) + Math.floor(10000000 * player.currentTime());
+
+            ApiClient.reportPlaybackStopped(Dashboard.getCurrentUserId(), itemId, positionTicks);
+
+            if (currentProgressInterval) {
+                clearTimeout(currentProgressInterval);
+            }
+
+            if (player.techName == "html5") {
+                player.tag.src = "";
+                player.tech.removeTriggers();
+                player.load();
+            }
+
+            //remove custom buttons
+            delete _V_.ControlBar.prototype.options.components.ResolutionSelectorButton;
+            delete _V_.ControlBar.prototype.options.components.SubtitleSelectorButton;
+            delete _V_.ControlBar.prototype.options.components.LanguageSelectorButton;
+            delete _V_.ControlBar.prototype.options.components.ChapterSelectorButton;
+
+            //player.tech.destroy();
+            player.destroy();
+        } else {
+            elem.pause();
+            elem.src = "";
+        }
+
+        $(elem).remove();
+
+        $('#nowPlayingBar').hide();
+
+        currentMediaElement = null;
+    };
+
+    self.isPlaying = function () {
+        return currentMediaElement;
+    };
+
+    return self;
+
+})(document, clearTimeout, screen, localStorage, _V_, $);
\ No newline at end of file