Skip to content

Commit

Permalink
fixed video using wrong path
Browse files Browse the repository at this point in the history
  • Loading branch information
ericmatthys committed May 9, 2012
1 parent cd51960 commit 2bfb9c4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion app/js/plex/control/utils/Transcoder.js
Expand Up @@ -75,7 +75,7 @@ define(
success: function (response) {
var m3u8_rel = response.replace(/[\s\S]+(session.+?\.m3u8)[\s\S]+/, '$1');
session_id = m3u8_rel.split('/')[1];
var m3u8 = baseURL + m3u8_rel + '?X-Plex-Token=' + token;
var m3u8 = baseURL + m3u8_rel;

$el.attr('src', m3u8);
},
Expand Down
6 changes: 4 additions & 2 deletions app/js/plex/view/players/VideoPlayerView.js
Expand Up @@ -18,15 +18,17 @@ define(
var VideoPlayerView = BaseView.extend({
id: 'video-player',
tagName: 'section',
className: 'content animated-fast scaleIn',
className: 'content fixed-width animated-fast scaleIn',

player: undefined,

render: function () {
this.$el.html(tpl(this.model.toJSON()));

console.log(this.model);

// Start transcoding the video
Transcoder.video(this.model.get('key'), this.$('video'));
Transcoder.video(this.model.get('Media').Part.key, this.$('video'));

return this;
}
Expand Down

0 comments on commit 2bfb9c4

Please sign in to comment.