Commit: 0da93104107009b029c71f744b472de51d1bcf6a - ogatool (git)

oga's tools

Commit MetaInfo

• Révision: 0da93104107009b029c71f744b472de51d1bcf6a (tree)
• l'heure: 2021-05-09 06:29:12
• Auteur: hyperoga <hyperoga@gmai...>
• Commiter: hyperoga

Message de Log

21/05/08 V0.32 support 64bit Linux

Change Summary

• modified: wavcut.c

Modification

--- a/wavcut.c
+++ b/wavcut.c
@@ -15,6 +15,7 @@
  *    12/03/19 V0.29 fix -ex degrade  (調査中 ex. -ex 00:05-21:50) 
  *    21/05/02 V0.30 support -cs cut silent part
  *    21/05/03 V0.31 fix LIST chunk bug
+ *    21/05/08 V0.32 support 64bit Linux
  *
  *
  *    お勧め: wavcut -s -lv 20 -ln 15
@@ -50,7 +51,7 @@
 #define strncasecmp strnicmp
 #endif /* _WIN32 */
 
-#define VER      "0.31"
+#define VER      "0.32"
 #define dprintf if (vf) printf
 #define dprintf2 if (vf >= 2) printf
 #define sgn(x) (x==0)?0:((x>0)?1:-1)
@@ -71,7 +72,8 @@ int  mf     = 0;    /* -m  merge wavfiles                     V0.27-A */
 int  csf    = 0;    /* -cs cut silent part                    V0.30-A */
 int  peak_level = 0;  /* peak level for -no                           */
 int  max_level  = 0;  /* max  level for -no                           */
-long pre_datlen = 0;  /* heders total length to wav data              */
+/* long pre_datlen = 0;  heders total length to wav data              */
+int  pre_datlen = 0;  /* heders total length to wav data      V0.32-C */
 
 int  gBytePerSample = 0; /* Byte / Sample                             */
 int  gChannels      = 0; /* Num of Channel                            */
@@ -81,13 +83,13 @@ int  gUnit          = 0; /* Byte / Sample * nChannel                  */
 /* data formats */
 struct riff_hdr {
     char          id[4];           /* RIFF id   ("RIFF")        */
-    unsigned long len;             /* length                    */
+    unsigned int  len;             /* length            V0.32-C */
     char          wave_id[4];      /* data type ("WAVE")        */
 };
 
 struct chunk_hdr {
     char          id[4];           /* chunk id  ("fmt "|"data"...) */
-    unsigned long len;             /* chunk length                 */
+    unsigned int  len;             /* chunk length         V0.32-C */
 };
 
 /* chunk type fmt  1 */
@@ -105,8 +107,8 @@ struct ck_fmt {
 #define IBM_FORMAT_ALAW		0x0102  /* IBM a-law format                 */
 #define IBM_FORMAT_ADPCM	0x0103  /* IBM AVC Adaptive Diff PCM format */
     unsigned short wChannels;         /* Number of channels    */
-    unsigned long  dwSamplesPerSec;   /* Sampling rate         */
-    unsigned long  dwAvgBytesPerSec;  /* For buffer estimation */
+    unsigned int   dwSamplesPerSec;   /* Sampling rate         V0.32-C */
+    unsigned int   dwAvgBytesPerSec;  /* For buffer estimation V0.32-C */
     unsigned short wBlockAlign;       /* Data block size       */
     unsigned short wBitsPerSample;    /* Sample size (for WAVE_FORMAT_PCM */
     unsigned short unknown;           /* Unknown data                     */
@@ -451,7 +453,7 @@ int WavAnalyze(FILE *fp)
 	    if (sf || csf || (ntment && outf)) {  /* V0.30-A */
                 /* ### Open Output File */
 	        sprintf(fname, "%s_%03d.wav", in_fname, file_cnt++);
-	        printf("## Writing %s ...\n", fname);
+	        printf("## Writing1 %s ...\n", fname);
 	        wfp = fopen(fname, "wb");
 	        if (wfp == NULL) {
 	            perror(fname);
@@ -567,7 +569,7 @@ int WavAnalyze(FILE *fp)
 			}
 			if (sf) {
 	                    sprintf(fname, "%s_%03d.wav", in_fname, file_cnt++);
-	                    printf("## Writing %s ...\n", fname);
+	                    printf("## Writing2 %s ...\n", fname);
                             /* ### Open Next Wav File */
 	                    wfp = fopen(fname, "wb");
 	                    if (wfp == NULL) {
@@ -622,7 +624,7 @@ int WavAnalyze(FILE *fp)
 			if (wfp == NULL) {
                             data_size = 0;   /* reset data chunk size */
 	                    sprintf(fname, "%s_%03d.wav", in_fname, file_cnt++);
-	                    printf("## Writing %s ...\n", fname);
+	                    printf("## Writing3 %s ...\n", fname);
                             /* ### Open Wav File */
 	                    wfp = fopen(fname, "wb");
 	                    if (wfp == NULL) {
@@ -1015,7 +1017,7 @@ void MergeWavs(char **files)
 		if (sf || (ntment && outf)) {
 		    /* ### Open Output File */
 		    sprintf(fname, "%s_%03d.wav", in_fname, file_cnt++);
-		    printf("## Writing %s ...\n", fname);
+		    printf("## Writing4 %s ...\n", fname);
 		    wfp = fopen(fname, "wb");
 		    if (wfp == NULL) {
 			perror(fname);
@@ -1125,7 +1127,7 @@ void MergeWavs(char **files)
 			    data_size = 0;   /* reset data chunk size */
 			    if (sf) {
 				sprintf(fname, "%s_%03d.wav", in_fname, file_cnt++);
-				printf("## Writing %s ...\n", fname);
+				printf("## Writing5 %s ...\n", fname);
 				/* ### Open Next Wav File */
 				wfp = fopen(fname, "wb");
 				if (wfp == NULL) {
@@ -1180,7 +1182,7 @@ void MergeWavs(char **files)
 			    if (wfp == NULL) {
 				data_size = 0;   /* reset data chunk size */
 				sprintf(fname, "%s_%03d.wav", in_fname, file_cnt++);
-				printf("## Writing %s ...\n", fname);
+				printf("## Writing6 %s ...\n", fname);
 				/* ### Open Wav File */
 				wfp = fopen(fname, "wb");
 				if (wfp == NULL) {
@@ -1411,7 +1413,7 @@ int main(int a, char *b[])
             ++vf;
             continue;
         }
-        if (!strncmp(b[i],"-d",2)) {
+        if (!strcmp(b[i],"-d")) {
             df = 1;    /* Display Wav Data */
             continue;
         }
@@ -1419,7 +1421,7 @@ int main(int a, char *b[])
             rvf = 1;    /* Reduce Voice */
             continue;
         }
-        if (!strncmp(b[i],"-s",2)) {
+        if (!strcmp(b[i],"-s")) {
 	    if (ntment || csf) {      /* V0.30-C */
 	        usage();
 	    }
@@ -1428,7 +1430,7 @@ int main(int a, char *b[])
         }
 
 	/* V0.30-A start */
-        if (!strncmp(b[i],"-cs",2)) {
+        if (!strcmp(b[i],"-cs")) {
 	    if (ntment || sf) {
 	        usage();
 	    }