Changeset 65

Timestamp:

Sep 22, 2023, 8:23:34 PM (23 months ago)

Author:

gyoung

Message:

Code to allow integration of FFMPEG or S/Mplayer for playing modern video formats

File:

• trunk/classes/c/c_video/cwavi.c (modified) (4 diffs)

trunk/classes/c/c_video/cwavi.c

@@ -37 +37 @@
 #define M_CWAVI_Class_Source
 
+#define INCL_DOSFILEMGR
+#define INCL_DOSMISC
 #define INCL_PM
 #include <os2.h>
+#include <stdarg.h> 
+#include <stdio.h> 
 #include "helpid.h"
 #include "cwavi.ih"
@@ -72 +76 @@
           char chrPlayer[CCHMAXPATH]={0};
           char chrParams[CCHMAXPATH+2]="\"";
+          char chrTempParams[CCHMAXPATH+2]={0};
           char chrTitle[50];
           char *chrPtr=chrParams;
           ULONG ulSize;
-          ULONG ulRc;
-         
-          if(!PrfQueryProfileString(HINI_USERPROFILE, "CWMM", "aviplayer", NULLHANDLE, chrPlayer,
-                                    sizeof(chrPlayer)))
-            PrfQueryProfileString(HINI_USERPROFILE, "CWMM", "vb", "vb.exe", chrPlayer,
-                                  sizeof(chrPlayer));
-
-          chrPtr++;
+          ULONG ulRc;
+          char szFullFilename[CCHMAXPATH];
+
+          chrPtr++;
           ulSize=sizeof(chrParams)-2;
           _wpQueryRealName(somSelf, chrPtr, &ulSize, TRUE);
           strcat(chrPtr,"\"");
+          strcpy(chrTempParams, chrParams);
+          ulSize =PrfQueryProfileInt(HINI_USERPROFILE, "CWMM", "nomodvid", 0);
+          if(strstr(strlwr(chrTempParams), ".avi")) {
+            if(!PrfQueryProfileString(HINI_USERPROFILE, "CWMM", "aviplayer", NULLHANDLE, chrPlayer,
+                                      sizeof(chrPlayer)))
+              PrfQueryProfileString(HINI_USERPROFILE, "CWMM", "vb", "vb.exe", chrPlayer,
+                                    sizeof(chrPlayer));
+          }
+          else if(!ulSize) {
+            if(!PrfQueryProfileString(HINI_USERPROFILE, "CWMM", "mvidplayer", NULLHANDLE, chrPlayer,
+                                      sizeof(chrPlayer))) {
+              if(!DosSearchPath(SEARCH_IGNORENETERRS | SEARCH_ENVIRONMENT | SEARCH_CUR_DIRECTORY,
+                               "PATH",
+                               "ffplay.exe",
+                               (PBYTE) szFullFilename,
+                                CCHMAXPATH - 1))
+                strcpy(chrPlayer, szFullFilename);
+              else if(!DosSearchPath(SEARCH_IGNORENETERRS | SEARCH_ENVIRONMENT | SEARCH_CUR_DIRECTORY,
+                                     "PATH",
+                                     "smplayer.exe",
+                                     (PBYTE) szFullFilename,
+                                     CCHMAXPATH - 1))
+                strcpy(chrPlayer, szFullFilename);
+             else if(!DosSearchPath(SEARCH_IGNORENETERRS | SEARCH_ENVIRONMENT | SEARCH_CUR_DIRECTORY,
+                                     "PATH",
+                                     "mplayer.exe",
+                                     (PBYTE) szFullFilename,
+                                     CCHMAXPATH - 1))
+               strcpy(chrPlayer, szFullFilename);
+             else  {
+               char text[200];
+               sprintf(text, "No suitable video player could be found. Please install ffplay (part of ffmpeg) or smplayer/mplayer somewhere in your path or in OS2.INI add the key mvidplayer under CWMM application containing the full path to an appropriate video player");
+  
+               WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, text, "Missing video player",
+                             1234, MB_OK|MB_MOVEABLE);
+               return NULLHANDLE;
+             }
+            }
+          }
           /* Get the Title for the window list */
           if(!getMessage(chrTitle, IDSTR_VIDPLAYERTITLE, sizeof(chrTitle), queryResModuleHandle(), HWND_DESKTOP))
@@ -135 +175 @@
 SOM_Scope PSZ  SOMLINK cwaviM_wpclsQueryInstanceType(M_MMAVI *somSelf)
 {
+    ULONG ulSize;
+
     /* M_CWAVIData *somThis = M_CWAVIGetData(somSelf); */
     M_MMAVIMethodDebug("M_MMAVI","cwaviM_wpclsQueryInstanceType");
 
-    return "AVI";
+    ulSize = PrfQueryProfileInt(HINI_USERPROFILE, "CWMM", "nomodvid", 0);
+    if(ulSize)
+      return "AVI";
+    else
+    return "AVI/FLV/3GP/M4V/MKV/MP4/MTS/VOB/WMV/WEBM";
 }
 
@@ -151 +197 @@
 SOM_Scope PSZ  SOMLINK cwaviM_wpclsQueryInstanceFilter(M_MMAVI *somSelf)
 {
+    ULONG ulSize;
+
     /* M_CWAVIData *somThis = M_CWAVIGetData(somSelf); */
     M_MMAVIMethodDebug("M_MMAVI","cwaviM_wpclsQueryInstanceFilter");
 
-    return "*.AVI";
+    ulSize =PrfQueryProfileInt(HINI_USERPROFILE, "CWMM", "nomodvid", 0);
+    if(ulSize)
+      return "*.AVI";
+    else
+      return "*.AVI,*.FLV,*.3GP,*.M4V,*.MKV,*.MP4,*.MTS,*.VOB,*.WMV,*.WEBM";
 }