MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-25 14:45:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

make wavstreamer take a -l of 0, also remove long opts

Browse Source
This commit is contained in:
Ron Pedde 2005-10-14 05:42:26 +00:00
parent d25c5a53ca
commit eba0f2f4fd
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/wavstreamer.c
View File

@ -34,18 +34,17 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
char *av0; char *av0;
#if 0
/* need better longopt detection in configure.in */
struct option longopts[] = struct option longopts[] =
{ { "help", 0, NULL, 'h' }, { { "help", 0, NULL, 'h' },
{ "samples", 1, NULL, 's' }, { "samples", 1, NULL, 's' },
{ "length", 1, NULL, 'l' }, { "length", 1, NULL, 'l' },
{ "offset", 1, NULL, '0' }, { "offset", 1, NULL, '0' },
{ NULL, 0, NULL, 0 } }; { NULL, 0, NULL, 0 } };
#endif
#define GET_WAV_INT32(p) ((((unsigned long)((p)[3])) << 24) | \ #define GET_WAV_INT32(p) ((((unsigned long)((p)[3])) << 24) | \
(((unsigned long)((p)[2])) << 16) | \ (((unsigned long)((p)[2])) << 16) | \
@ -233,9 +232,9 @@ static void usage(int exitval)
fprintf(stderr, fprintf(stderr,
"--samples and --length are mutually exclusive.\n"); "--samples and --length are mutually exclusive.\n");
#ifndef HAVE_GETOPT_H #if 1
fprintf(stderr, fprintf(stderr,
"\n\nLong options are not availabl eon this system.\n"); "\n\nLong options are not available on this system.\n");
#endif #endif
exit(exitval); exit(exitval);
@ -259,7 +258,7 @@ int main(int argc, char **argv)
else else
av0 = argv[0]; av0 = argv[0];
#ifdef HAVE_GETOPT_H #if 0
while ((c = getopt_long(argc, argv, "+hl:o:s:", longopts, NULL)) != EOF) { while ((c = getopt_long(argc, argv, "+hl:o:s:", longopts, NULL)) != EOF) {
#else #else
while ((c = getopt(argc, argv, "hl:o:s:")) != -1) { while ((c = getopt(argc, argv, "hl:o:s:")) != -1) {
@ -288,10 +287,12 @@ int main(int argc, char **argv)
us = 0; us = 0;
} }
/*
if ((sec == 0) && (us == 0)) { if ((sec == 0) && (us == 0)) {
fprintf(stderr, "%s: Invalid -l argument (zero is not acceptable).\n", av0); fprintf(stderr, "%s: Invalid -l argument (zero is not acceptable).\n", av0);
exit(-1); exit(-1);
} }
*/
if (samples != 0) { if (samples != 0) {
fprintf(stderr, "%s: Parameters -s and -l are mutually exclusive.\n", av0); fprintf(stderr, "%s: Parameters -s and -l are mutually exclusive.\n", av0);