Permalink
Browse files

Fix bluray playback when path to bluray mountpoint contains a trailing /

Bluray playback started from either mythfrontend or mythavtest would fail if the path provided contained a trailing / (such as /media/cdrom0/).
Issue lied with ProgramInfo::GetPlaybackURL() trying to find if the file was local. Now do not attempt any file path processing if the URI is for DVD or BD playback

Fixes #10340 (Part 1)
  • Loading branch information...
jyavenard committed Feb 22, 2012
1 parent 765b8e4 commit 2fa00e745deff33d2a342fca367ba15bdc62fa96
Showing with 5 additions and 1 deletion.
  1. +4 −0 mythtv/libs/libmyth/programinfo.cpp
  2. +1 −1 mythtv/programs/mythfrontend/main.cpp
@@ -2209,6 +2209,10 @@ QString ProgramInfo::QueryBasename(void) const
QString ProgramInfo::GetPlaybackURL(
bool checkMaster, bool forceCheckLocal) const
{
+ // return the original path if BD or DVD URI
+ if (IsVideoBD() || IsVideoDVD())
+ return GetPathname();
+
QString basename = QueryBasename();
if (basename.isEmpty())
return "";
@@ -676,7 +676,7 @@ static void playDisc()
{
GetMythUI()->AddCurrentLocation("playdisc");
- QString filename = QString("bd:/%1/").arg(bluray_mountpoint);
+ QString filename = QString("bd:/%1").arg(bluray_mountpoint);
GetMythMainWindow()->HandleMedia("Internal", filename, "", "", "", "",
0, 0, "", 0, "", "", true);

0 comments on commit 2fa00e7

Please sign in to comment.