Skip to content

Commit 6f9d6e8

Browse files
committed
Fix regression from _video property rename.
1 parent 5fac79f commit 6f9d6e8

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

plex_mpv_shim/bulk_subtitle.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def process_series(mode, url, player, m_raid=None, m_rsid=None):
2727
messages.clear()
2828
show_text = player._player.show_text
2929
c_aid, c_sid = None, None
30-
c_pid = player._video._part_node.get("id")
30+
c_pid = player._media_item._part_node.get("id")
3131

3232
success_ct = 0
3333
partial_ct = 0
@@ -105,7 +105,7 @@ def process_series(mode, url, player, m_raid=None, m_rsid=None):
105105
time.sleep(3)
106106
if c_aid:
107107
render_message("Setting Current...", show_text)
108-
if player._video.is_transcode:
108+
if player._media_item.is_transcode:
109109
player.put_task(player.set_streams, c_aid, c_sid)
110110
player.timeline_handle()
111111
else:

plex_mpv_shim/client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ def setStreams(self, path, arguments):
384384
playerManager.set_streams(audioStreamID, subtitleStreamID)
385385

386386
def refreshPlayQueue(self, path, arguments):
387-
playerManager._video.parent.upd_play_queue()
387+
playerManager._media_item.parent.upd_play_queue()
388388
playerManager.upd_player_hide()
389389
timelineManager.SendTimelineToSubscribers()
390390

plex_mpv_shim/menu.py

+15-15
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,15 @@ def show_menu(self):
103103
self.menu_title = "Main Menu"
104104
self.menu_selection = 0
105105

106-
if self.playerManager._video and not player.playback_abort:
106+
if self.playerManager._media_item and not player.playback_abort:
107107
self.menu_list = [
108108
("Change Audio", self.change_audio_menu),
109109
("Change Subtitles", self.change_subtitle_menu),
110110
("Change Video Quality", self.change_transcode_quality),
111111
]
112112
if self.profile_menu is not None:
113113
self.menu_list.append(("Change Video Playback Profile", self.profile_menu))
114-
if self.playerManager._video.parent.is_tv:
114+
if self.playerManager._media_item.parent.is_tv:
115115
self.menu_list.append(("Auto Set Audio/Subtitles (Entire Series)", self.change_tracks_menu))
116116
self.menu_list.append(("Quit and Mark Unwatched", self.unwatched_menu_handle))
117117
else:
@@ -189,7 +189,7 @@ def menu_action(self, action):
189189
self.refresh_menu()
190190

191191
def change_audio_menu_handle(self):
192-
if self.playerManager._video.is_transcode:
192+
if self.playerManager._media_item.is_transcode:
193193
self.playerManager.put_task(self.playerManager.set_streams, self.menu_list[self.menu_selection][2], None)
194194
self.playerManager.timeline_handle()
195195
else:
@@ -200,7 +200,7 @@ def change_audio_menu(self):
200200
self.put_menu("Select Audio Track")
201201

202202
selected_aid, _ = self.playerManager.get_track_ids()
203-
audio_streams = self.playerManager._video._part_node.findall("./Stream[@streamType='2']")
203+
audio_streams = self.playerManager._media_item._part_node.findall("./Stream[@streamType='2']")
204204
for i, audio_track in enumerate(audio_streams):
205205
aid = audio_track.get("id")
206206
self.menu_list.append([
@@ -212,7 +212,7 @@ def change_audio_menu(self):
212212
self.menu_selection = i
213213

214214
def change_subtitle_menu_handle(self):
215-
if self.playerManager._video.is_transcode:
215+
if self.playerManager._media_item.is_transcode:
216216
self.playerManager.put_task(self.playerManager.set_streams, None, self.menu_list[self.menu_selection][2])
217217
self.playerManager.timeline_handle()
218218
else:
@@ -223,7 +223,7 @@ def change_subtitle_menu(self):
223223
self.put_menu("Select Subtitle Track")
224224

225225
_, selected_sid = self.playerManager.get_track_ids()
226-
subtitle_streams = self.playerManager._video._part_node.findall("./Stream[@streamType='3']")
226+
subtitle_streams = self.playerManager._media_item._part_node.findall("./Stream[@streamType='3']")
227227
self.menu_list.append(["None", self.change_subtitle_menu_handle, "0"])
228228
for i, subtitle_track in enumerate(subtitle_streams):
229229
sid = subtitle_track.get("id")
@@ -238,11 +238,11 @@ def change_subtitle_menu(self):
238238
def change_transcode_quality_handle(self):
239239
bitrate = self.menu_list[self.menu_selection][2]
240240
if bitrate == "none":
241-
self.playerManager._video.set_trs_override(None, False, False)
241+
self.playerManager._media_item.set_trs_override(None, False, False)
242242
elif bitrate == "max":
243-
self.playerManager._video.set_trs_override(None, True, False)
243+
self.playerManager._media_item.set_trs_override(None, True, False)
244244
else:
245-
self.playerManager._video.set_trs_override(bitrate, True, True)
245+
self.playerManager._media_item.set_trs_override(bitrate, True, True)
246246

247247
self.menu_action("back")
248248
self.playerManager.put_task(self.playerManager.restart_playback)
@@ -259,15 +259,15 @@ def change_transcode_quality(self):
259259
self.menu_list.append((item[0], handle, item[1]))
260260

261261
self.menu_selection = 7
262-
cur_bitrate = self.playerManager._video.get_transcode_bitrate()
262+
cur_bitrate = self.playerManager._media_item.get_transcode_bitrate()
263263
for i, option in enumerate(self.menu_list):
264264
if cur_bitrate == option[2]:
265265
self.menu_selection = i
266266

267267
def change_tracks_handle(self):
268268
mode = self.menu_list[self.menu_selection][2]
269-
parentSeriesKey = self.playerManager._video.parent.tree.find("./").get("parentKey") + "/children"
270-
url = self.playerManager._video.parent.get_path(parentSeriesKey)
269+
parentSeriesKey = self.playerManager._media_item.parent.tree.find("./").get("parentKey") + "/children"
270+
url = self.playerManager._media_item.parent.get_path(parentSeriesKey)
271271
process_series(mode, url, self.playerManager)
272272

273273
def change_tracks_manual_s1(self):
@@ -286,8 +286,8 @@ def change_tracks_manual_s3(self):
286286
# Pop 3 menu items.
287287
for i in range(3):
288288
self.menu_action("back")
289-
parentSeriesKey = self.playerManager._video.parent.tree.find("./").get("parentKey") + "/children"
290-
url = self.playerManager._video.parent.get_path(parentSeriesKey)
289+
parentSeriesKey = self.playerManager._media_item.parent.tree.find("./").get("parentKey") + "/children"
290+
url = self.playerManager._media_item.parent.get_path(parentSeriesKey)
291291
process_series("manual", url, self.playerManager, aid, sid)
292292

293293
def change_tracks_menu(self):
@@ -346,7 +346,7 @@ def sub_settings_handle(self):
346346
self.menu_action("back")
347347
self.preferences_menu()
348348

349-
if self.playerManager._video.is_transcode:
349+
if self.playerManager._media_item.is_transcode:
350350
if setting_name == "subtitle_size":
351351
self.playerManager.put_task(self.playerManager.update_subtitle_visuals)
352352
else:

0 commit comments

Comments
 (0)