open separate audio file menu item

aliakseis · Apr 4, 2024 · 9546ea8 · 9546ea8
1 parent a774faf
commit 9546ea8
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 3 deletions.
diff --git a/Player/Player.rc b/Player/Player.rc
@@ -185,6 +185,7 @@ BEGIN
             MENUITEM "Upend",                       ID_ORIENTATION_UPEND
         END
         MENUITEM SEPARATOR
+        MENUITEM "Open Audio File...",      ID_OPEN_AUDIO_FILE
         MENUITEM "Open Subtitles File...",      ID_OPENSUBTITLESFILE
         POPUP "Open Subtitles"
         BEGIN

diff --git a/Player/PlayerDoc.cpp b/Player/PlayerDoc.cpp
@@ -312,6 +312,8 @@ BEGIN_MESSAGE_MAP(CPlayerDoc, CDocument)
                &CPlayerDoc::OnConvertVideosIntoCompatibleFormat)
     ON_UPDATE_COMMAND_UI(ID_CONVERT_VIDEOS_INTO_COMPATIBLE_FORMAT,
                          &CPlayerDoc::OnUpdateConvertVideosIntoCompatibleFormat)
+    ON_COMMAND(ID_OPEN_AUDIO_FILE, &CPlayerDoc::OnOpenAudioFile)
+    ON_UPDATE_COMMAND_UI(ID_OPEN_AUDIO_FILE, &CPlayerDoc::OnUpdateOpenAudioFile)
     END_MESSAGE_MAP()
 
 
@@ -726,7 +728,8 @@ BOOL CPlayerDoc::OnSaveDocument(LPCTSTR lpszPathName)
 
 bool CPlayerDoc::openDocument(LPCTSTR lpszPathName, bool openSeparateFile /*= false*/)
 {
-    reset();
+    if (!openSeparateFile)
+        reset();
 
     CString currentDirectory;
     if (auto fileName = PathFindFileName(lpszPathName))
@@ -782,6 +785,7 @@ bool CPlayerDoc::openDocument(LPCTSTR lpszPathName, bool openSeparateFile /*= fa
             {
                 return false;
             }
+            reset();
             mappedAudioFile = dlg.GetPathName();
             static_cast<CPlayerApp*>(AfxGetApp())->SetMappedAudioFile(lpszPathName, dlg.GetPathName());
         }
@@ -1605,7 +1609,7 @@ void CPlayerDoc::OnConvertVideosIntoCompatibleFormat()
 
 void CPlayerDoc::OnUpdateConvertVideosIntoCompatibleFormat(CCmdUI* pCmdUI)
 {
-    if (GetPathName().IsEmpty())
+    if (GetPathName().IsEmpty() || !m_url.empty())
     {
         pCmdUI->Enable(false);
         return;
@@ -1643,3 +1647,26 @@ void CPlayerDoc::OnUpdateConvertVideosIntoCompatibleFormat(CCmdUI* pCmdUI)
         pCmdUI->Enable(false);
     }
 }
+
+void CPlayerDoc::OnOpenAudioFile()
+{
+    openDocument(GetPathName(), true);
+}
+
+void CPlayerDoc::OnUpdateOpenAudioFile(CCmdUI* pCmdUI)
+{
+    if (GetPathName().IsEmpty() || !m_url.empty())
+    {
+        pCmdUI->Enable(false);
+        return;
+    }
+
+    const auto extension = PathFindExtension(GetPathName());
+    if (!_tcsicmp(extension, _T(".lst")) || !_tcsicmp(extension, _T(".url")))
+    {
+        pCmdUI->Enable(false);
+        return;
+    }
+
+    pCmdUI->Enable(true);
+}
diff --git a/Player/PlayerDoc.h b/Player/PlayerDoc.h
@@ -208,4 +208,6 @@ class CPlayerDoc : public CDocument, public FrameDecoderListener
     afx_msg void OnUpdateFixEncoding(CCmdUI* pCmdUI);
     afx_msg void OnConvertVideosIntoCompatibleFormat();
     afx_msg void OnUpdateConvertVideosIntoCompatibleFormat(CCmdUI* pCmdUI);
+    afx_msg void OnOpenAudioFile();
+    afx_msg void OnUpdateOpenAudioFile(CCmdUI* pCmdUI);
 };
diff --git a/Player/resource.h b/Player/resource.h
@@ -68,13 +68,14 @@
 #define ID_ORIENTATION_RORATE_270       32798
 #define ID_FIX_ENCODING                 32799
 #define ID_CONVERT_VIDEOS_INTO_COMPATIBLE_FORMAT  32800
+#define ID_OPEN_AUDIO_FILE              32801
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        321
-#define _APS_NEXT_COMMAND_VALUE         32801
+#define _APS_NEXT_COMMAND_VALUE         32802
 #define _APS_NEXT_CONTROL_VALUE         1021
 #define _APS_NEXT_SYMED_VALUE           310
 #endif