Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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 2fa00e7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions mythtv/libs/libmyth/programinfo.cpp
Expand Up @@ -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 "";
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythfrontend/main.cpp
Expand Up @@ -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);
Expand Down

0 comments on commit 2fa00e7

Please sign in to comment.