Changeset 165

Timestamp:

Mar 27, 2024, 10:32:40 PM (17 months ago)

Author:

gyoung

Message:

Changes to avoid opening winos2/mplayer.exe; Add avi, mov and jpeg to the file types opened by a modern video player. Use the generic video icon when the modern video player is used; quiet the screen when mplayer is used; get mplayer and ffplay to close when video is finished

Location:

trunk/classes/c

Files:

• c_common/helper.c (modified) (2 diffs)
• c_video/cwavi.c (modified) (9 diffs)

trunk/classes/c/c_common/helper.c

@@ -53 +53 @@
 
 HMODULE queryModuleHandle(void);
-
+void writeLog(const char* chrFormat, ...);
 
 MRESULT EXPENTRY appTerminateHandlerProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
@@ -102 +102 @@
   }
   /* Start the application */
-  happ = WinStartApp( hwndAppTerminateHandler, &pDetails,NULL, NULL, SAF_INSTALLEDCMDLINE);
-  // happ = WinStartApp( hwndAppTerminateHandler, &pDetails, parameters, NULL, 0);
+  if(strstr(strlwr(parameters), "mplayer") /*|| strstr(strlwr(parameters), "ffplay")*/)
+    happ = WinStartApp( hwndAppTerminateHandler, &pDetails, NULL, NULL, SAF_INSTALLEDCMDLINE | SAF_MINIMIZED);
+  else
+    happ = WinStartApp( hwndAppTerminateHandler, &pDetails, NULL, NULL, SAF_INSTALLEDCMDLINE);
+  //happ = WinStartApp( hwndAppTerminateHandler, &pDetails, parameters, NULL, 0);
   if(happ) {
     /* Application started. Add the object to inuse list. */

trunk/classes/c/c_video/cwavi.c

@@ -42 +42 @@
 #include <os2.h>
 #include <stdarg.h> 
-#include <stdio.h> 
+#include <stdio.h>
 #include "helpid.h"
 #include "cwavi.ih"
@@ -52 +52 @@
 BOOL getMessage(char* text,ULONG ulID, LONG lSizeText, HMODULE hResource,HWND hwnd);
 ULONG launchPMProg(PSZ pszTitle, PSZ wrapperExe, PSZ parameters,  CWMMDataFile *thisPtr, ULONG ulView);
-
+void writeLog(const char* chrFormat, ...);
 
 /*
@@ -75 +75 @@
         {
           char chrPlayer[CCHMAXPATH]={0};
-          char chrParams[CCHMAXPATH+2]="\"";
-          char chrTempParams[CCHMAXPATH+2]={0};
+          char chrParams[(CCHMAXPATH*2)+2]="\"";
+          char chrTempParams[(CCHMAXPATH*2)+2]={0};
           char chrTitle[50];
-          char *chrPtr=chrParams;
+          char *chrPtr=chrParams;
           ULONG ulSize;
-          ULONG ulRc;
-          char szFullFilename[CCHMAXPATH];
+          ULONG ulRc = 0;
+          char szFullFilename[CCHMAXPATH]={0};
+          BOOL ffplay=FALSE;
+          BOOL found=FALSE;
 
           chrPtr++;
@@ -88 +90 @@
           strcat(chrPtr,"\"");
           strcpy(chrTempParams, chrParams);
-          ulSize =PrfQueryProfileInt(HINI_USERPROFILE, "CWMM", "nomodvid", 0);
-          if(strstr(strlwr(chrTempParams), ".avi")) {
+          ulSize=PrfQueryProfileInt(HINI_USERPROFILE, "CWMM", "nomodvid", 0);
+          if(ulSize && strstr(strlwr(chrTempParams), ".avi")) {
             if(!PrfQueryProfileString(HINI_USERPROFILE, "CWMM", "aviplayer", NULLHANDLE, chrPlayer,
                                       sizeof(chrPlayer)))
@@ -95 +97 @@
                                     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[300];
-               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");
+          else {
+            ULONG ulLength = PrfQueryProfileString(HINI_USERPROFILE, "CWMM", "mvidplayer", NULLHANDLE, chrPlayer,
+                                  sizeof(chrPlayer));
+            if((ulLength == 0) || (!strchr(chrPlayer, ":") && (!strstr(strlwr(chrPlayer), "smplayer") &&
+                                                               strstr(strlwr(chrPlayer), "mplayer")))) {
+              char tempFilePath[CCHMAXPATH];
+              char newPath[2048];
+              char *path;
+
+              //Prevent us from getting the mplayer.exe in the winos2 directory
+              path=getenv("PATH");
+              strcpy(newPath, path);
+              chrPtr=strstr(strlwr(newPath), ":\\os2\\mdos\\winos2");
+              if(chrPtr)
+                strcpy(chrPtr - 1, chrPtr + 18);
+              path = strtok(newPath, ";");
+              while(path != NULL) {
+                strcpy(tempFilePath, path);
+                strcat(tempFilePath, "\\mplayer.exe");
+                if(!DosQueryPathInfo(tempFilePath, FIL_STANDARD, (PVOID)szFullFilename, (ULONG)CCHMAXPATH-1)) {
+                  strcpy(chrPlayer, tempFilePath);
+                  found=TRUE;
+                  break;
+                }
+                path = strtok(NULL, ";");
+              }
+            }
+            if(!ulLength && !found &&
+               !DosSearchPath(SEARCH_IGNORENETERRS | SEARCH_ENVIRONMENT | SEARCH_CUR_DIRECTORY, "PATH",
+                              "smplayer.exe", (PBYTE) szFullFilename, CCHMAXPATH - 1)){
+              found=TRUE;
+              strcpy(chrPlayer, szFullFilename);
+            }
+            if(!ulLength && !found &&
+               !DosSearchPath(SEARCH_IGNORENETERRS | SEARCH_ENVIRONMENT | SEARCH_CUR_DIRECTORY, "PATH",
+                                                     "ffplay.exe", (PBYTE) szFullFilename, CCHMAXPATH - 1)) {
+              found=TRUE;
+              strcpy(chrPlayer, szFullFilename);
+            }
+            if(!ulLength && !found)  {
+              char text[300];
+              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;
-             }
-            }
+              WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, text, "Missing video player",
+                            1234, MB_OK|MB_MOVEABLE);
+              return NULLHANDLE;
+           }
+          }
+          /* Eliminate the noise with mplayer and ffplay and get them to close gracefully*/
+          if(strstr(strlwr(chrPlayer), "ffplay"))
+            ffplay = TRUE;
+          if((!strstr(strlwr(chrPlayer), "smplayer") && strstr(strlwr(chrPlayer), "mplayer")) || ffplay) {
+            strcpy(chrTempParams, " /c \"");
+            strcat(chrTempParams, chrPlayer);
+            strcat(chrTempParams, " ");
+            if(ffplay)
+              strcat(chrTempParams, "-autoexit ");
+            strcat(chrTempParams, chrParams);
+            strcat(chrTempParams, "\"");
+            strcpy(chrParams, chrTempParams);
+            strcpy(chrPlayer, "CMD.EXE");
           }
           /* Get the Title for the window list */
@@ -131 +166 @@
 
           if((ulRc=launchPMProg(chrTitle, chrPlayer, chrParams, somSelf, ulView))==NULLHANDLE) {
-            break;
+            break;
           }
-          return NULLHANDLE;
+          return NULLHANDLE;
         }
       default:
         break;
       }
-
-    return (MMAVI_parent_MMVideo_wpOpen(somSelf, hwndCnr, ulView, 
-                                        param));
+    return (MMAVI_parent_MMVideo_wpOpen(somSelf, hwndCnr, ulView, param));
 }
 
@@ -184 +217 @@
       return "AVI";
     else
-    return "AVI/FLV/3GP/M4V/MKV/MP4/MTS/VOB/WMV/WEBM";
+    return "AVI/FLV/3GP/M4V/MKV/MOV/MP4/MPEG/MTS/VOB/WMV/WEBM";
 }
 
@@ -202 +235 @@
     M_MMAVIMethodDebug("M_MMAVI","cwaviM_wpclsQueryInstanceFilter");
 
-    ulSize =PrfQueryProfileInt(HINI_USERPROFILE, "CWMM", "nomodvid", 0);
+    ulSize=PrfQueryProfileInt(HINI_USERPROFILE, "CWMM", "nomodvid", 0);
     if(ulSize)
       return "*.AVI";
     else
-      return "*.AVI,*.FLV,*.3GP,*.M4V,*.MKV,*.MP4,*.MTS,*.VOB,*.WMV,*.WEBM";
+      return "*.AVI,*.FLI,*.FLC,*.FLV,*.3GP,*.M4V,*.MKV,*.MOV,*.MP4,*.MPEG,*.MTS,*.VOB,*.WMV,*.WEBM";
 }
 
@@ -229 +262 @@
       return M_MMAVI_parent_M_MMVideo_wpclsQueryIconData(somSelf, pIconInfo);
 
-        if (pIconInfo)   {
+    if(pIconInfo)   {
+      ULONG ulSize=PrfQueryProfileInt(HINI_USERPROFILE, "CWMM", "nomodvid", 0);
       pIconInfo->fFormat = ICON_RESOURCE;
       pIconInfo->hmod    = hmod;
-      pIconInfo->resid   = ID_ICONAVIFILE;
-        } /* endif */
+      if(ulSize)
+        pIconInfo->resid   = ID_ICONAVIFILE;
+      else
+        pIconInfo->resid   = ID_ICONCWVIDEOFILE;
+    } /* endif */
 
         return ( sizeof(ICONINFO) );