Fixed invalid transcode sessions
This commit is contained in:
parent
a16b2e5c7c
commit
821a8bbb3c
|
@ -141,6 +141,8 @@
|
||||||
this.playertime = 0
|
this.playertime = 0
|
||||||
this.bufferedTile = null
|
this.bufferedTile = null
|
||||||
this.playingMetadata = null
|
this.playingMetadata = null
|
||||||
|
this.initDoneAudio = false
|
||||||
|
this.initDoneSubs = false
|
||||||
return data.callback(true)
|
return data.callback(true)
|
||||||
}
|
}
|
||||||
if (data.command == '/player/playback/seekTo') {
|
if (data.command == '/player/playback/seekTo') {
|
||||||
|
@ -198,6 +200,8 @@
|
||||||
chosenQuality: JSON.parse(window['localStorage'].getItem('PTPLAYERQUALITY')) || 'Original', // The quality profile
|
chosenQuality: JSON.parse(window['localStorage'].getItem('PTPLAYERQUALITY')) || 'Original', // The quality profile
|
||||||
chosenSubtitleIndex: -100, // Subtitle track index
|
chosenSubtitleIndex: -100, // Subtitle track index
|
||||||
chosenAudioTrackIndex: -100, // Audio track index
|
chosenAudioTrackIndex: -100, // Audio track index
|
||||||
|
initDoneAudio: false,
|
||||||
|
initDoneSubs: false,
|
||||||
sources: [],
|
sources: [],
|
||||||
|
|
||||||
// Player status
|
// Player status
|
||||||
|
@ -219,12 +223,15 @@
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
chosenKey: function () {
|
chosenKey: function () {
|
||||||
|
//console.log('Chosen key changed')
|
||||||
this.changedPlaying(true)
|
this.changedPlaying(true)
|
||||||
},
|
},
|
||||||
chosenServer: function () {
|
chosenServer: function () {
|
||||||
this.changedPlaying(true)
|
//console.log('Chosen server changed')
|
||||||
|
//this.changedPlaying(true)
|
||||||
},
|
},
|
||||||
chosenQuality: function () {
|
chosenQuality: function () {
|
||||||
|
//console.log('Chosen quality changed')
|
||||||
this.changedPlaying(false)
|
this.changedPlaying(false)
|
||||||
//console.log('Our new preferred quality is now ' + this.chosenQuality )
|
//console.log('Our new preferred quality is now ' + this.chosenQuality )
|
||||||
this.$store.commit('setSettingPTPLAYERQUALITY',this.chosenQuality)
|
this.$store.commit('setSettingPTPLAYERQUALITY',this.chosenQuality)
|
||||||
|
@ -233,13 +240,15 @@
|
||||||
|
|
||||||
this.chosenSubtitleIndex = 0
|
this.chosenSubtitleIndex = 0
|
||||||
this.chosenAudioTrackIndex = 0
|
this.chosenAudioTrackIndex = 0
|
||||||
|
//console.log('Chosen mediaindex changed')
|
||||||
this.changedPlaying(false)
|
this.changedPlaying(false)
|
||||||
},
|
},
|
||||||
chosenAudioTrackIndex: function () {
|
chosenAudioTrackIndex: function () {
|
||||||
if (this.chosenAudioTrackIndex == -100){
|
if (this.chosenAudioTrackIndex == -100 || !this.initDoneAudio){
|
||||||
|
//console.log('Audio track changed but not going to do any work')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
console.log('Audio track change')
|
//console.log('Audio track change')
|
||||||
if (this.playingMetadata && this.playingMetadata.type == 'episode') {
|
if (this.playingMetadata && this.playingMetadata.type == 'episode') {
|
||||||
// We should save this preference for this series in our localStorage
|
// We should save this preference for this series in our localStorage
|
||||||
|
|
||||||
|
@ -249,14 +258,17 @@
|
||||||
this.savePrefence('audio',seriesKey,languageCode)
|
this.savePrefence('audio',seriesKey,languageCode)
|
||||||
|
|
||||||
}
|
}
|
||||||
this.changeAudioTrack(() => {})
|
this.changeAudioTrack(() => {
|
||||||
|
this.changedPlaying(false)
|
||||||
|
})
|
||||||
|
|
||||||
},
|
},
|
||||||
chosenSubtitleIndex: function () {
|
chosenSubtitleIndex: function () {
|
||||||
if (this.chosenSubtitleIndex == -100){
|
if (this.chosenSubtitleIndex == -100 || !this.initDoneSubs){
|
||||||
|
//console.log('Sub track changed but not going to do any work')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
console.log('Audio track change')
|
//console.log('Subtitle track change')
|
||||||
if (this.playingMetadata && this.playingMetadata.type == 'episode') {
|
if (this.playingMetadata && this.playingMetadata.type == 'episode') {
|
||||||
// We should save this preference for this series in our localStorage
|
// We should save this preference for this series in our localStorage
|
||||||
|
|
||||||
|
@ -266,7 +278,9 @@
|
||||||
this.savePrefence('subs',seriesKey,languageCode)
|
this.savePrefence('subs',seriesKey,languageCode)
|
||||||
|
|
||||||
}
|
}
|
||||||
this.changeSubtitleTrack((res) => {})
|
this.changeSubtitleTrack((res) => {
|
||||||
|
this.changedPlaying(false)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
@ -396,7 +410,7 @@
|
||||||
return null
|
return null
|
||||||
},
|
},
|
||||||
changeSubtitleTrack (callback) {
|
changeSubtitleTrack (callback) {
|
||||||
//console.log('Subtitle track change')
|
console.log('Changing the subtitle track')
|
||||||
var that = this
|
var that = this
|
||||||
let subtitleStreamID = 0
|
let subtitleStreamID = 0
|
||||||
if (this.chosenSubtitleIndex > -1) {
|
if (this.chosenSubtitleIndex > -1) {
|
||||||
|
@ -427,7 +441,6 @@
|
||||||
}
|
}
|
||||||
request(options, function (error, response, body) {
|
request(options, function (error, response, body) {
|
||||||
if (!error) {
|
if (!error) {
|
||||||
that.changedPlaying(false)
|
|
||||||
return callback(true)
|
return callback(true)
|
||||||
}
|
}
|
||||||
return callback(false)
|
return callback(false)
|
||||||
|
@ -435,6 +448,7 @@
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
changeAudioTrack (callback){
|
changeAudioTrack (callback){
|
||||||
|
console.log('Changing the audio track')
|
||||||
var that = this
|
var that = this
|
||||||
let audioStreamID = this.playingMetadata.Media[this.chosenMediaIndex].Part[0].Stream[this.chosenAudioTrackIndex].id
|
let audioStreamID = this.playingMetadata.Media[this.chosenMediaIndex].Part[0].Stream[this.chosenAudioTrackIndex].id
|
||||||
let baseparams = this.getSourceByLabel(this.chosenQuality).params
|
let baseparams = this.getSourceByLabel(this.chosenQuality).params
|
||||||
|
@ -462,7 +476,6 @@
|
||||||
}
|
}
|
||||||
request(options, function (error, response, body) {
|
request(options, function (error, response, body) {
|
||||||
if (!error) {
|
if (!error) {
|
||||||
that.changedPlaying(false)
|
|
||||||
return callback(true)
|
return callback(true)
|
||||||
}
|
}
|
||||||
return callback(false)
|
return callback(false)
|
||||||
|
@ -580,10 +593,10 @@
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
changedPlaying: function (changeItem) {
|
changedPlaying: function (changeItem) {
|
||||||
|
console.log('CHANGED PLAYING')
|
||||||
var that = this
|
var that = this
|
||||||
this.ready = false
|
this.ready = false
|
||||||
this.$store.commit('SET_DECISIONBLOCKED', false)
|
//this.$store.commit('SET_DECISIONBLOCKED', false)
|
||||||
//console.log('Changed what we are meant to be playing!')
|
//console.log('Changed what we are meant to be playing!')
|
||||||
if (!this.chosenKey || !this.chosenServer) {
|
if (!this.chosenKey || !this.chosenServer) {
|
||||||
this.playerstatus = 'stopped'
|
this.playerstatus = 'stopped'
|
||||||
|
@ -598,6 +611,7 @@
|
||||||
},
|
},
|
||||||
url: that.getSourceByLabel(that.chosenQuality).initUrl
|
url: that.getSourceByLabel(that.chosenQuality).initUrl
|
||||||
}
|
}
|
||||||
|
console.log('Firing final transcode decision command')
|
||||||
request(options, function (error, response, body) {
|
request(options, function (error, response, body) {
|
||||||
if (error){
|
if (error){
|
||||||
return false
|
return false
|
||||||
|
@ -631,7 +645,9 @@
|
||||||
this.chosenSubtitleIndex = this.getInitSubtitleTrackIndex()
|
this.chosenSubtitleIndex = this.getInitSubtitleTrackIndex()
|
||||||
if (this.chosenAudioTrackIndex != 0 || this.chosenSubtitleIndex != 0){
|
if (this.chosenAudioTrackIndex != 0 || this.chosenSubtitleIndex != 0){
|
||||||
this.changeSubtitleTrack(() => {
|
this.changeSubtitleTrack(() => {
|
||||||
|
this.initDoneSubs = true
|
||||||
this.changeAudioTrack(() => {
|
this.changeAudioTrack(() => {
|
||||||
|
this.initDoneAudio = true
|
||||||
req()
|
req()
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue