Changeset 91 for branches/v2.9_Lars/mediafolder/c

Timestamp:

Oct 1, 2023, 4:30:02 PM (23 months ago)

Author:

erdmann

Message:

merging v2.9 into v2.9_Lars branch, in particular, this means adding french,spanish,russian translations

Location:

branches/v2.9_Lars

Files:

• . (modified) (1 prop)
• mediafolder/c/cddb/cddb.cpp (modified) (30 diffs)
• mediafolder/c/cddb/printhelper.cpp (modified) (2 diffs)
• mediafolder/c/cddb/res/makefile (modified) (6 diffs)
• mediafolder/c/cddb/res/pmcddb007.DEF (copied) (copied from branches/v2.9/mediafolder/c/cddb/res/pmcddb007.DEF ) (1 diff)
• mediafolder/c/cddb/res/pmcddb007.dlg (copied) (copied from branches/v2.9/mediafolder/c/cddb/res/pmcddb007.dlg )
• mediafolder/c/cddb/res/pmcddb007.rc (copied) (copied from branches/v2.9/mediafolder/c/cddb/res/pmcddb007.rc )
• mediafolder/c/cddb/res/pmcddb033.DEF (copied) (copied from branches/v2.9/mediafolder/c/cddb/res/pmcddb033.DEF ) (1 diff)
• mediafolder/c/cddb/res/pmcddb033.c (copied) (copied from branches/v2.9/mediafolder/c/cddb/res/pmcddb033.c )
• mediafolder/c/cddb/res/pmcddb033.dlg (copied) (copied from branches/v2.9/mediafolder/c/cddb/res/pmcddb033.dlg )
• mediafolder/c/cddb/res/pmcddb033.rc (copied) (copied from branches/v2.9/mediafolder/c/cddb/res/pmcddb033.rc )
• mediafolder/c/cddb/res/pmcddb034.DEF (copied) (copied from branches/v2.9/mediafolder/c/cddb/res/pmcddb034.DEF ) (1 diff)
• mediafolder/c/cddb/res/pmcddb034.c (copied) (copied from branches/v2.9/mediafolder/c/cddb/res/pmcddb033.c ) (2 diffs)
• mediafolder/c/cddb/res/pmcddb034.dlg (copied) (copied from branches/v2.9/mediafolder/c/cddb/res/pmcddb034.dlg )
• mediafolder/c/cddb/res/pmcddb034.rc (copied) (copied from branches/v2.9/mediafolder/c/cddb/res/pmcddb034.rc )
• mediafolder/c/helper/cddbhelper.cpp (modified) (3 diffs)

branches/v2.9_Lars/mediafolder/c/cddb/cddb.cpp

@@ -88 +88 @@
     delete(tempTrack);
   }
-  
+
   if(nextCddb)delete nextCddb;
 
@@ -129 +129 @@
   if(tempTrack) {
     /* Yes, add  the rest of the title to that what we already have */
-    strncat(tempTrack->trackname, track->trackname, sizeof(tempTrack->trackname)-strlen(tempTrack->trackname)-1);    
+    strncat(tempTrack->trackname, track->trackname, sizeof(tempTrack->trackname)-strlen(tempTrack->trackname)-1);
     delete(track);
     return;
@@ -136 +136 @@
   tempTrack=firstTrack;
   while(tempTrack->nextTrack) {
-    tempTrack=tempTrack->nextTrack;  
+    tempTrack=tempTrack->nextTrack;
   }
   tempTrack->nextTrack=track;
-  return;  
+  return;
 }
 
@@ -152 +152 @@
       return tempTrack;
 
-    tempTrack=tempTrack->nextTrack;  
+    tempTrack=tempTrack->nextTrack;
   }
 
@@ -169 +169 @@
 
 #if 0
-/* now defined in printHelper.cpp 
+/* now defined in printHelper.cpp
    or cddbhelper.cpp. By choosing the right module to link to, it's possible
    to redirect the messages without changing this module. Used for different
@@ -191 +191 @@
   fileHandle=open("cddb.out",O_APPEND|O_TEXT|O_WRONLY);
   if(fileHandle==-1) {
-    printError("Cannot open cddb.out");
+    printError((char *)"Cannot open cddb.out");
     return;
   }
@@ -205 +205 @@
 
 int readResponse(int s, char * buffer,int size)
-{ 
+{
   int a;
   int rc;
-  
+
   rc=1;
   for(a=0;a<size&&rc>0;a++) {
@@ -217 +217 @@
     }
     if(rc==-1)
-      return CDDB_ERROR;    
-  }
-   
+      return CDDB_ERROR;
+  }
+
   return CDDB_ERROR;
 }
@@ -237 +237 @@
     case '3': return CDDB_MORE;
     case '4':
-      printError("CDDB server error");
+      printError((char *)"CDDB server error");
       return CDDB_ERROR;
     case '5':
-      printError("CDDB client error");
+      printError((char *)"CDDB client error");
       return CDDB_ERROR;
     default:
-      printError("Unknown error");
+      printError((char *)"Unknown error");
       break;
     }
@@ -258 +258 @@
   /* Handshaking */
   if(verbose)
-    printError("Handshaking...    ");
+    printError((char *)"Handshaking...    ");
   sprintf(buffer,"cddb hello %s %s %s %s\n",username,hostname,clientname,version);
-  if(verbose==2) 
+  if(verbose==2)
     printError(buffer);
   rc=write(s,buffer,strlen(buffer));
   if(rc==-1) {
-    printError("Handshaking: cannot write to CDDB server");
-    return -1;
-  }
-  if(verbose)
-    printError("done\n");
-  if(verbose==2)
-    printError("Response: ");
-  
+    printError((char *)"Handshaking: cannot write to CDDB server");
+    return -1;
+  }
+  if(verbose)
+    printError((char *)"done\n");
+  if(verbose==2)
+    printError((char *)"Response: ");
+
   rc=readResponse(s,buffer,sizeof(buffer));
   if(rc==CDDB_ERROR) {
-    printError("Handshaking: cannot get response");
-    return -1;
-  }
-  if(verbose==2) 
+    printError((char *)"Handshaking: cannot get response");
+    return -1;
+  }
+  if(verbose==2)
     printErrorCR(buffer);
- 
+
   if(check_cddb_code(buffer)==CDDB_ERROR)
     return -1;
@@ -297 +297 @@
   do {
     if(verbose)
-      printError("\nSetting protocol level...    ");
+      printError((char *)"\nSetting protocol level...    ");
     sprintf(buffer,"proto %d\n",iProtLevel);
     printError(buffer);
     rc=write(s,buffer,strlen(buffer));
     if(rc==-1) {
-      printError("Protocol: cannot write to CDDB server");
+      printError((char *)"Protocol: cannot write to CDDB server");
       return -1;
     }
     if(verbose)
-      printError("done\n");
+      printError((char *)"done\n");
     if(verbose==2)
-      printError("Response: ");
-    
+      printError((char *)"Response: ");
+
     rc=readResponse(s,buffer,sizeof(buffer));
     if(rc==CDDB_ERROR) {
-      printError("Set protocol: cannot get response");
+      printError((char *)"Set protocol: cannot get response");
       return -1;
     }
     if(verbose==2)
       printErrorCR(buffer);
-    
+
     /* Check cddb code */
     if(check_cddb_code(buffer)==CDDB_ERROR) {
@@ -326 +326 @@
       break;
     /* protocol not supported. Decrement level and try again. */
-    iProtLevel--;      
+    iProtLevel--;
   }while(iProtLevel>0);
-  
+
   return 0;
 }
@@ -343 +343 @@
   do {
     rc=readResponse(s,buffer,sizeof(buffer)); /* Get next line */
-    
+
     if(rc==CDDB_ERROR)
       return root; /* return what we have so far */
@@ -351 +351 @@
 
     /* A new cddb instance for every match */
-    Cddb=new cddb("","","",1); /* One fuzzy match or one of several matches */
+    Cddb=new cddb((char *)"",(char *)"",(char *)"",1); /* One fuzzy match or one of several matches */
     /* Get the data for this match */
     sscanf(buffer, " %20s %x %100[^/\r\n] / %100[^\r\n]", Cddb->category,&Cddb->discid,Cddb->artist,Cddb->title);
@@ -359 +359 @@
     else
       root->linkCddb(Cddb);
-    
+
   }while(true);
 
@@ -383 +383 @@
   /* Sending query */
   if(verbose)
-    printError("Sending query cmd...    ");
+    printError((char *)"Sending query cmd...    ");
   /* Build cmd-line */
   sprintf(buffer,"cddb query %08x %d",cddbInfo->discid,cddbInfo->numTracks);
@@ -389 +389 @@
     rc=snprintf(track,sizeof(track)," %d",cddbInfo->startSector[a]);
     if(rc==EOF||rc>=sizeof(track)) {
-      printError("Query: buffer overrun while formatting track offsets.\nPlease report this bug.\n");
+      printError((char *)"Query: buffer overrun while formatting track offsets.\nPlease report this bug.\n");
       return 0;
     }
     if(sizeof(buffer)-strlen(buffer) <= strlen(track)) {
-      printError("Query: buffer overrun while adding track offsets to command.\nPlease report this bug.\n");
+      printError((char *)"Query: buffer overrun while adding track offsets to command.\nPlease report this bug.\n");
       return 0;
     }
@@ -401 +401 @@
   rc=snprintf(track,sizeof(track), " %d\n",cddbInfo->discLength);
   if(rc==EOF||rc>=sizeof(track)) {
-    printError("Query: buffer overrun while formatting disclength.\nPlease report this bug.\n");
+    printError((char *)"Query: buffer overrun while formatting disclength.\nPlease report this bug.\n");
     return 0;
   }
   if(sizeof(buffer)-strlen(buffer) <= strlen(track)) {
-    printError("Query: buffer overrun while adding disclength to command.\nPlease report this bug.\n");
+    printError((char *)"Query: buffer overrun while adding disclength to command.\nPlease report this bug.\n");
     return 0;
   }
@@ -415 +415 @@
   rc=write(s,buffer,strlen(buffer));
   if(rc==-1) {
-    printError("Query: cannot write to CDDB server");
+    printError((char *)"Query: cannot write to CDDB server");
     return 0;
   }
   if(verbose)
-    printError(" done\n");
-  if(verbose==2)
-    printError("Response: ");
-  
+    printError((char *)" done\n");
+  if(verbose==2)
+    printError((char *)"Response: ");
+
   rc=readResponse(s,buffer,sizeof(buffer));
   //rc=read(s,buffer,sizeof(buffer)-1);
   if(rc==CDDB_ERROR) {
-    printError("Query: cannot get response");
+    printError((char *)"Query: cannot get response");
     return 0;
   }
@@ -440 +440 @@
     {
     case 200:  /* exact match */
-      Cddb=new cddb("","","");
+      Cddb=new cddb((char *)"",(char *)"",(char *)"");
 
       sscanf(buffer+4, "%20s %x %100[^/\r\n] / %100[^\r\n]", Cddb->category,&Cddb->discid,Cddb->artist,Cddb->title);
@@ -457 +457 @@
   /* We shouldn't reach this */
   return 0;
-}  
+}
 
 /* Reads the CDDB banner from the server after connecting */
@@ -471 +471 @@
   rc=readResponse(s,buffer,sizeof(buffer));
   if(rc==CDDB_ERROR) {
-    printError("Cannot read CDDB-Banner");
+    printError((char *)"Cannot read CDDB-Banner");
     return -1;
   }
@@ -493 +493 @@
   int iTrack=0;
   int iTemp=0;
-  
+
   do{
     rc=readResponse(s,buffer,sizeof(buffer));
     if(rc==CDDB_ERROR) {
-      printError("Read request: cannot get response");
+      printError((char *)"Read request: cannot get response");
       return CDDB_ERROR;
     }
@@ -504 +504 @@
     if(buffer[0]!='.')
       printData(buffer);
-    
+
     if(buffer[0]=='#') /* This is a comment */
       { }
@@ -511 +511 @@
       if(buffer[0]=='.') /* End of data */
         return CDDB_OK; /* Done */
-      
+
       //printf("Found data: %s\n",buffer);
       sscanf(buffer,"%20[^0-9=]",key);
@@ -524 +524 @@
   }while(rc==CDDB_MORE);
 
+  return CDDB_OK;
 }
 
@@ -534 +535 @@
 
   /* Build cmd-line */
-  sprintf(buffer,"cddb read %s %08x\n",Cddb->category,Cddb->discid);  
-  if(verbose) 
-    printError("\nSending read cmd... ");
+  sprintf(buffer,"cddb read %s %08x\n",Cddb->category,Cddb->discid);
+  if(verbose)
+    printError((char *)"\nSending read cmd... ");
   if(verbose==2)
     printError(buffer);
-  
+
   rc=write(s,buffer,strlen(buffer));
   if(rc==-1) {
-    printError("Read request: cannot write to CDDB server");
-    return -1;
-  }
-  if(verbose) 
-    printError("done\n");
-  if(verbose==2)
-    printError("Response: ");
-  
+    printError((char *)"Read request: cannot write to CDDB server");
+    return -1;
+  }
+  if(verbose)
+    printError((char *)"done\n");
+  if(verbose==2)
+    printError((char *)"Response: ");
+
   rc=readResponse(s,buffer,sizeof(buffer));
   if(rc==CDDB_ERROR) {
-    printError("Read request: cannot get response");
-    return -1;
-  }
-  if(verbose==2) 
+    printError((char *)"Read request: cannot get response");
+    return -1;
+  }
+  if(verbose==2)
     printError(buffer);
   if(check_cddb_code(buffer)==CDDB_ERROR)
     return CDDB_ERROR;
 
-  /* Get the data */  
+  /* Get the data */
   read_and_parse(s,Cddb);
-  return CDDB_OK;  
+  return CDDB_OK;
 }
 
@@ -577 +578 @@
   /* Creating socket */
   if(verbose)
-    printError("Creating socket...     ");
+    printError((char *)"Creating socket...     ");
   s=socket(AF_INET,SOCK_STREAM,0);
   if(s==-1) {
-    printError("Cannot create socket!");
+    printError((char *)"Cannot create socket!");
     return -1;
   }
   *skt=s;
   if(verbose)
-    printError("Socket created\n");
+    printError((char *)"Socket created\n");
 
   /* Querying host */
   if(verbose)
-    printError("Querying host...     ");
+    printError((char *)"Querying host...     ");
   he = gethostbyname(host);
   if(he==NULL) {
-    printError("Cannot get host address.\ngethostbyname() returned error:  ");
+    printError((char *)"Cannot get host address.\ngethostbyname() returned error:  ");
     switch (h_errno)
       {
       case HOST_NOT_FOUND:
-        printError("Host not found\n");
+        printError((char *)"Host not found\n");
         break;
       case TRY_AGAIN:
-        printError("Temporary error. Try again later.\n");
+        printError((char *)"Temporary error. Try again later.\n");
         break;
       case NO_DATA:
-        printError("Name valid but name server has no associated address.\n");
+        printError((char *)"Name valid but name server has no associated address.\n");
         break;
       case NO_RECOVERY:
-        printError("Unrecoverable error.\n");
+        printError((char *)"Unrecoverable error.\n");
         break;
       default:
-        printError("Unknown error\n");
+        printError((char *)"Unknown error\n");
       }
     /* Close the socket */
     close(s);
     return -1;
-  }   
-
-  if(verbose)
-    printError("Host found.\n");
+  }
+
+  if(verbose)
+    printError((char *)"Host found.\n");
 
 
   /* Connecting to host */
   if(verbose)
-    printError("Connecting to host...    ");
+    printError((char *)"Connecting to host...    ");
   memset(&sa_in,0, sizeof(struct sockaddr_in));
 
@@ -634 +635 @@
       {
       case EBADF:
-        printError("No valid socket descriptor");
+        printError((char *)"No valid socket descriptor");
         break;
       case EISCONN:
-        printError("The socket is already connected\n");
+        printError((char *)"The socket is already connected\n");
         break;
       case ETIMEDOUT:
-        printError("No connection. Timed out.\n");
+        printError((char *)"No connection. Timed out.\n");
         break;
       case ECONNREFUSED:
-        printError("Connection refused by  host.\n");
+        printError((char *)"Connection refused by  host.\n");
         break;
       case EADDRNOTAVAIL:
-        printError("Address not avaiable.\n");
+        printError((char *)"Address not avaiable.\n");
         break;
 
       default:
-        printError("General failure: Cannot connect to host\n");
+        printError((char *)"General failure: Cannot connect to host\n");
       }
     close(s);
@@ -656 +657 @@
   }
   if(verbose)
-    printError("connected.\n");
+    printError((char *)"connected.\n");
   return 0;
 }

branches/v2.9_Lars/mediafolder/c/cddb/printhelper.cpp

@@ -30 +30 @@
  */
 
-void extern printError(char* errorString)
+void printError(char* errorString)
 {
   fprintf(stderr,"%s",errorString);
 }
 
-void extern printErrorCR(char* errorString)
+void printErrorCR(char* errorString)
 {
   fprintf(stderr,"%s\n",errorString);
@@ -41 +41 @@
 
 
-void extern printData(char* outString)
+void printData(char* outString)
 {
   int fileHandle;

branches/v2.9_Lars/mediafolder/c/cddb/res/makefile

@@ -13 +13 @@
 
 CPPFILES        =
-all:     pmcddb001.dll pmcddb049.dll pmcddb031.dll pmcddb039.dll pmcddb088.dll
+all:     pmcddb001.dll pmcddb049.dll pmcddb031.dll pmcddb039.dll pmcddb088.dll pmcddb033.dll pmcddb034.dll
 
 
@@ -29 +29 @@
                 gcc -Zdll -Zomf -I$(INC) pmcddb049.c pmcddb049.def
                 rc pmcddb049.res pmcddb049.dll
-#               icc $(CPPFLAGS) -I$(INC) pmcddb001.c pmcddb04á.def
 
 pmcddb049.res:  pmcddb049.rc pmcddb049.dlg $(INC)\pmcddbres.h 
@@ -37 +36 @@
                 gcc -Zdll -Zomf -I$(INC) pmcddb031.c pmcddb031.def
                 rc pmcddb031.res pmcddb031.dll
-#               icc $(CPPFLAGS) -I$(INC) pmcddb001.c pmcddb04á.def
 
 pmcddb031.res:  pmcddb031.rc pmcddb031.dlg $(INC)\pmcddbres.h 
@@ -45 +43 @@
                 gcc -Zdll -Zomf -I$(INC) pmcddb039.c pmcddb039.def
                 rc pmcddb039.res pmcddb039.dll
-#               icc $(CPPFLAGS) -I$(INC) pmcddb001.c pmcddb04á.def
 
 pmcddb039.res:  pmcddb039.rc pmcddb039.dlg $(INC)\pmcddbres.h 
@@ -57 +54 @@
                 rc  -i $(INC) -r pmcddb088.rc 
 
+pmcddb033.dll:  pmcddb033.c pmcddb033.res
+                gcc -Zdll -Zomf -I$(INC) pmcddb033.c pmcddb033.def
+                rc pmcddb033.res pmcddb033.dll
+
+pmcddb033.res:  pmcddb033.rc pmcddb033.dlg $(INC)\pmcddbres.h 
+                rc  -i $(INC) -r pmcddb033.rc 
+
+pmcddb034.dll:  pmcddb034.c pmcddb034.res
+                gcc -Zdll -Zomf -I$(INC) pmcddb034.c pmcddb034.def
+                rc pmcddb034.res pmcddb034.dll
+
+pmcddb034.res:  pmcddb034.rc pmcddb034.dlg $(INC)\pmcddbres.h 
+                rc  -i $(INC) -r pmcddb034.rc 
+
 clean:
         -rm *.obj
@@ -64 +75 @@
 cleaner:
         -rm *.*~
-
-        
-

branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb007.DEF

@@ -19 +19 @@
 ; */
 
-LIBRARY PMDB001 INITGLOBAL
+LIBRARY PMDB007 INITINSTANCE TERMINSTANCE
 DESCRIPTION '$@#(c) Chris Wohlgemuth :0.1 (12.05.02) (PMDB001.DLL)#@##1## 12.05.2002 18:17:00      ;-)  ::::1::@@Resource-DLL'
-PROTMODE
-CODE LOADONCALL DISCARDABLE
-DATA SINGLE SHARED DISCARDABLE
-EXPORTS  
-        queryLanguage
+DATA MULTIPLE NONSHARED
+EXPORTS
+      queryLanguage = _queryLanguage
 

branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb033.DEF

@@ -22 +22 @@
 ;  */
 
-LIBRARY PMDB033 INITGLOBAL
+LIBRARY PMDB033 INITINSTANCE TERMINSTANCE
 DESCRIPTION '$@#(c) Chris Wohlgemuth :0.1 (12.05.02) (PMDB033.DLL)#@##1## 12.05.2002 18:17:00      Mon ;-)  ::::1::@@DLL Ressource'
-PROTMODE
-CODE LOADONCALL DISCARDABLE
-DATA SINGLE SHARED DISCARDABLE
+DATA MULTIPLE NONSHARED
 EXPORTS
-        queryLanguage
+      queryLanguage = _queryLanguage

branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb034.DEF

@@ -18 +18 @@
 ; */
 
-LIBRARY PMDB034 INITGLOBAL
+LIBRARY PMDB034 INITINSTANCE TERMINSTANCE
 DESCRIPTION '$@#ž Chris Wohlgemuth :0.1 (12.05.02) (PMDB034.DLL)#@##1## 12.05.2002 18:17:00      Mi ;-)  ::::1::@@DLL de recursos'
-PROTMODE
-CODE LOADONCALL DISCARDABLE
-DATA SINGLE SHARED DISCARDABLE
+DATA MULTIPLE NONSHARED
 EXPORTS  
-        queryLanguage
+      queryLanguage = _queryLanguage
 

branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb034.c

@@ -17 +17 @@
  * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/*
- * French translation....: Guillaume Gay <guillaume[dot]gay[arobase]gmail[dot]com>
- * Version...............: 2020-07-22
- */
 
 #include <os2.h>
@@ -26 +22 @@
 PSZ queryLanguage()
 {
-  return "Fran‡ais (033)";
+  return "Espagnol (034)";
 }

branches/v2.9_Lars/mediafolder/c/helper/cddbhelper.cpp

@@ -38 +38 @@
  */
 
-void extern printError(char* errorString)
+void printError(char* errorString)
 {
     char buffer[CCHMAXPATH] = {0};
@@ -55 +55 @@
 }
 
-void extern printErrorCR(char* errorString)
+void printErrorCR(char* errorString)
 {
   fprintf(stderr,"%s\n",errorString);
@@ -63 +63 @@
 
 
-void extern printData(char* outString)
+void printData(char* outString)
 {
   int fileHandle;
   int rc;
 
-  /* The name cddbDataFile is defined in the main pmcddb.cpp file. It is 
+  /* The name cddbDataFile is defined in the main pmcddb.cpp file. It is
      the discid (this is the native format of the data hold by a cddb server) */
   fileHandle=open(cddbDataFile,O_APPEND|O_TEXT|O_WRONLY|O_CREAT,S_IWRITE);