mirror of
https://gitlab.xiph.org/xiph/ezstream.git
synced 2025-02-02 15:07:45 -05:00
Improve output messages some more when dealing with standard input.
git-svn-id: https://svn.xiph.org/trunk/ezstream@14009 0101bb08-14d6-0310-b084-bc0e0c8e3800
This commit is contained in:
parent
ee75e2a315
commit
259e3c1a62
@ -578,9 +578,6 @@ openResource(shout_t *shout, const char *fileName, int *popenFlag,
|
|||||||
metadata_free(&mdata);
|
metadata_free(&mdata);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vFlag)
|
|
||||||
printf("%s: Reading from standard input\n",
|
|
||||||
__progname);
|
|
||||||
if (isStdin != NULL)
|
if (isStdin != NULL)
|
||||||
*isStdin = 1;
|
*isStdin = 1;
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
@ -889,7 +886,8 @@ streamFile(shout_t *shout, const char *fileName)
|
|||||||
char *tmp, *metaData;
|
char *tmp, *metaData;
|
||||||
|
|
||||||
tmp = metadata_assemble_string(mdata);
|
tmp = metadata_assemble_string(mdata);
|
||||||
metaData = UTF8toCHAR(tmp, ICONV_REPLACE);
|
if ((metaData = UTF8toCHAR(tmp, ICONV_REPLACE)) == NULL)
|
||||||
|
metaData = xstrdup("(unknown title)");
|
||||||
xfree(tmp);
|
xfree(tmp);
|
||||||
printf("%s: Streaming ``%s''", __progname, metaData);
|
printf("%s: Streaming ``%s''", __progname, metaData);
|
||||||
if (vFlag)
|
if (vFlag)
|
||||||
@ -903,7 +901,8 @@ streamFile(shout_t *shout, const char *fileName)
|
|||||||
setMetadata(shout, mdata, NULL);
|
setMetadata(shout, mdata, NULL);
|
||||||
|
|
||||||
metadata_free(&mdata);
|
metadata_free(&mdata);
|
||||||
}
|
} else if (isStdin)
|
||||||
|
printf("%s: Streaming from standard input\n", __progname);
|
||||||
|
|
||||||
if (songLen > 0)
|
if (songLen > 0)
|
||||||
songLenStr = xstrdup(getTimeString(songLen));
|
songLenStr = xstrdup(getTimeString(songLen));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user