Merge pull request jgilje#17 from Sound-Linux-More/master

jgilje · web-flow · commit dba4b35568d7 · 2021-11-23T13:50:52.000+01:00
0.20211104: stdin only with a hyphen
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,10 @@
 Farbrausch V2M player
 SDL Port by github.com/jgilje
 
+0.20211104
+
+    stdin only with a hyphen 
+
 0.20210505
 
     removed 'force power size stdin buffer'
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(MAJOR_VERSION 0)
-set(DATE_VERSION 20210505)
-set(V2M_MAN_DATE "05 May 2021")
+set(DATE_VERSION 20211104)
+set(V2M_MAN_DATE "04 Nov 2021")
 set(V2M_VERSION ${MAJOR_VERSION}.${DATE_VERSION})
 project(v2mplayer VERSION ${V2M_VERSION})
 
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ sudo make install
 
 ```
 ./v2mplayer v2m/0test.v2m
-zcat v2m/Dafunk--breeze.v2mz | ./v2mplayer
+zcat v2m/Dafunk--breeze.v2mz | ./v2mplayer -
 gzip -cdf v2m/Dafunk--breeze.v2mz | ./v2mplayer -o Dafunk--breeze.newest.v2m
 ```
 
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
diff --git a/doc/VERSION b/doc/VERSION
@@ -1 +1 @@
-0.20180825
+0.20211104
diff --git a/man/man1/v2mplayer.1.in b/man/man1/v2mplayer.1.in
@@ -9,7 +9,7 @@ v2mplayer
  SDL Port by github.com/jgilje
 
 .SH SYNOPSIS
-\fBv2mplayer\fP [options] <input_file_v2m | stdin>
+\fBv2mplayer\fP [options] input_file_v2m | - (stdin)
 
 .SH OPTIONS
 .TP
@@ -30,7 +30,7 @@ help
 
 .SH EXAMPLE
  \fBv2mplayer\fP v2m/0test.v2m
- zcat v2m/Dafunk--breeze.v2mz | \fBv2mplayer\fP
+ zcat v2m/Dafunk--breeze.v2mz | \fBv2mplayer\fP -
 
 .SH COPYRIGHT
  Copyright 2016 Joakim L. Gilje.
diff --git a/src/tinyplayer.cpp b/src/tinyplayer.cpp
@@ -35,7 +35,7 @@ static void V2mPlayerTitle()
 }
 static void V2mPlayerUsage()
 {
-    printf("Usage : v2mplayer [options] <input_file_v2m>\n\n");
+    printf("Usage : v2mplayer [options] input_file_v2m | - (stdin)\n\n");
     printf("options:\n");
     printf("          -s N.N  start at position (float, optional, in s., default = 0.0)\n");
     printf("          -g N.N  gain (float, optional, default = 1.0)\n");
@@ -144,7 +144,7 @@ int main(int argc, char** argv)
         }
     }
 
-    if(fhelp > 0)
+    if((fhelp > 0)||(optind + 1 > argc))
     {
         V2mPlayerUsage();
         return 1;
@@ -154,7 +154,8 @@ int main(int argc, char** argv)
     uint64_t size;
     unsigned int blksz = 4096, read = 0, eofcnt = 0;
     char ch;
-    if(optind + 1 > argc)
+    const char *v2m_filename = argv[optind];
+    if (strcmp(v2m_filename, "-") == 0)
     {
         file = stdin;
         eofcnt = 0;
@@ -188,8 +189,6 @@ int main(int argc, char** argv)
         printf("Now Playing: stdin(%d[%lu])\n", read, size);
         size = read;
     } else {
-        const char *v2m_filename = argv[optind];
-
         file = fopen(v2m_filename, "rb");
         if (file == NULL)
         {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ static void V2mPlayerTitle()`
`35`	`35`	`}`
`36`	`36`	`static void V2mPlayerUsage()`
`37`	`37`	`{`
`38`		`- printf("Usage : v2mplayer [options] <input_file_v2m>\n\n");`
	`38`	`+ printf("Usage : v2mplayer [options] input_file_v2m \| - (stdin)\n\n");`
`39`	`39`	`printf("options:\n");`
`40`	`40`	`printf(" -s N.N start at position (float, optional, in s., default = 0.0)\n");`
`41`	`41`	`printf(" -g N.N gain (float, optional, default = 1.0)\n");`
`@@ -144,7 +144,7 @@ int main(int argc, char** argv)`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`
`147`		`- if(fhelp > 0)`
	`147`	`+ if((fhelp > 0)\|\|(optind + 1 > argc))`
`148`	`148`	`{`
`149`	`149`	`V2mPlayerUsage();`
`150`	`150`	`return 1;`
`@@ -154,7 +154,8 @@ int main(int argc, char** argv)`
`154`	`154`	`uint64_t size;`
`155`	`155`	`unsigned int blksz = 4096, read = 0, eofcnt = 0;`
`156`	`156`	`char ch;`
`157`		`- if(optind + 1 > argc)`
	`157`	`+ const char *v2m_filename = argv[optind];`
	`158`	`+ if (strcmp(v2m_filename, "-") == 0)`
`158`	`159`	`{`
`159`	`160`	`file = stdin;`
`160`	`161`	`eofcnt = 0;`
`@@ -188,8 +189,6 @@ int main(int argc, char** argv)`
`188`	`189`	`printf("Now Playing: stdin(%d[%lu])\n", read, size);`
`189`	`190`	`size = read;`
`190`	`191`	`} else {`
`191`		`- const char *v2m_filename = argv[optind];`
`192`		`-`
`193`	`192`	`file = fopen(v2m_filename, "rb");`
`194`	`193`	`if (file == NULL)`
`195`	`194`	`{`