Ticket #11245: 0001-Changed-DVD-angle-handling-to-be-1-based-throughout-.patch

mythtv/libs/libmythtv/Bluray/mythbdplayer.cpp

@@ -239 +239 @@
 
 QString MythBDPlayer::GetAngleName(int angle) const
 {
-    if (angle >= 0 && angle < GetNumAngles())
+    if (angle >= 1 && angle <= GetNumAngles())
     {
-        QString name = QObject::tr("Angle %1").arg(angle+1);
+        QString name = QObject::tr("Angle %1").arg(angle);
         return name;
     }
     return QString();

mythtv/libs/libmythtv/DVD/mythdvdplayer.cpp

@@ -628 +628 @@
 
 QString MythDVDPlayer::GetAngleName(int angle) const
 {
-    if (angle >= 0 && angle < GetNumAngles())
+    if (angle >= 1 && angle <= GetNumAngles())
     {
-        QString name = QObject::tr("Angle %1").arg(angle+1);
+        QString name = QObject::tr("Angle %1").arg(angle);
         return name;
     }
     return QString();
@@ -642 +642 @@
     if (!total || angle == GetCurrentAngle())
         return false;
 
-    if (angle >= (int)total)
-        angle = 0;
+    if (angle < 1 || angle > (int)total)
+        angle = 1;
 
     return player_ctx->buffer->DVD()->SwitchAngle(angle);
 }

mythtv/libs/libmythtv/tv_play.cpp

@@ -11431 +11431 @@
         currenttext = tr("Angle");
         int current_angle = GetCurrentAngle(ctx);
 
-        for (int i = 0; i < num_angles; i++)
+        for (int i = 1; i <= num_angles; i++)
         {
             QString angleIdx = QString("%1").arg(i, 3, 10, QChar(48));
             QString desc = GetAngleName(ctx, i);