Editor: Allow deleting "un-cut" areas.

Allow deleting un-cut areas to join surrounding cut areas. This is a shortcut that is more intuitive to most than the current approach. Thanks to Jim Stichnoth for the suggestion.
MythTV · Jan 27, 2011 · a51c237 · a51c237
1 parent 585b232
commit a51c237
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp
@@ -3678,11 +3678,8 @@ bool MythPlayer::HandleProgramEditorActions(QStringList &actions,
         }
         else if (action == "DELETE")
         {
-            if (IsInDelete(frame))
-            {
-                deleteMap.Delete(frame, totalFrames);
-                refresh = true;
-            }
+            deleteMap.Delete(frame, totalFrames);
+            refresh = true;
         }
         else if (action == "REVERT")
         {

diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
@@ -8908,6 +8908,9 @@ void TV::ShowOSDCutpoint(PlayerContext *ctx, const QString &type)
             osd->DialogAddButton(QObject::tr("Add New Cut"),
                                  QString("DIALOG_CUTPOINT_NEWCUT_%1")
                                          .arg(frame));
+            osd->DialogAddButton(QObject::tr("Join Surrounding Cuts"),
+                                 QString("DIALOG_CUTPOINT_DELETE_%1")
+                                         .arg(frame));
         }
         if ("EDIT_CUT_POINTS" == type)
             osd->DialogAddButton(QObject::tr("Cut List Options"),