mirror of
https://gitlab.xiph.org/xiph/ezstream.git
synced 2024-11-03 04:17:18 -05:00
cleanup of config files
fixed reencoding bug on win32 bump to version 0.2.0 git-svn-id: https://svn.xiph.org/trunk/ezstream@8612 0101bb08-14d6-0310-b084-bc0e0c8e3800
This commit is contained in:
oddsock
parent
d23ebe69e8
commit
e48b3b61aa
1
README
1
README
@ -14,7 +14,6 @@ ezstream can stream mp3, ogg vorbis, and ogg theora files as well as reading fro
|
||||
ID3v1 tags are supported in mp3 files and all ogg vorbis tags are propagated
|
||||
as metadata as well.
|
||||
|
||||
|
||||
CONFIG FILE
|
||||
:::::::::::
|
||||
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
<ezstream>
|
||||
<url>http://localhost:8000/testmount</url>
|
||||
<sourcepassword>hackme</sourcepassword>
|
||||
<format>MP3</format>
|
||||
<filename>mymp3tracks.m3u</filename>
|
||||
<!-- The following settings are used to describe your stream
|
||||
to the server. It's up to you to make sure the
|
||||
bitrate/quality/samplerate/channels
|
||||
match up to your input stream -->
|
||||
<svrinfoname>My Stream</svrinfoname>
|
||||
<svrinfourl>http://www.oddsock.org</svrinfourl>
|
||||
<svrinfogenre>RockNRoll</svrinfogenre>
|
||||
<svrinfodescription>This is a stream description</svrinfodescription>
|
||||
<svrinfobitrate>128</svrinfobitrate>
|
||||
<!-- Quality is only applicable to ogg vorbis streams -->
|
||||
<!-- <svrinfoquality>1.0</svrinfoquality> -->
|
||||
<svrinfochannels>2</svrinfochannels>
|
||||
<svrinfosamplerate>44100</svrinfosamplerate>
|
||||
<svrinfopublic>1</svrinfopublic>
|
||||
</ezstream>
|
||||
@ -1,8 +1,12 @@
|
||||
<!-- This example is for a input playlist that must contain
|
||||
all MP3 files. ezstream will perform NO reencoding, and
|
||||
the destination stream bitrate, channels, etc. will be those
|
||||
of the input files -->
|
||||
<ezstream>
|
||||
<url>http://localhost:8000/testmount</url>
|
||||
<url>http://localhost:8000/stream</url>
|
||||
<sourcepassword>hackme</sourcepassword>
|
||||
<format>MP3</format>
|
||||
<filename>Track13.mp3</filename>
|
||||
<filename>playlist.m3u</filename>
|
||||
<!-- The following settings are used to describe your stream
|
||||
to the server. It's up to you to make sure the
|
||||
bitrate/quality/samplerate/channels
|
||||
|
||||
79
conf/ezstream_reencoding_example_mp3.xml
Normal file
79
conf/ezstream_reencoding_example_mp3.xml
Normal file
@ -0,0 +1,79 @@
|
||||
<!-- This example is for a input playlist that can contain
|
||||
FLAC, MP3, and OggVorbis files and a output stream that
|
||||
is MP3. The output stream settings (bitrate, channels, etc.)
|
||||
are controlled by the parameters to lame. (see the encode setting
|
||||
for the MP3 format later in this file). -->
|
||||
<ezstream>
|
||||
<url>http://localhost:8000/stream</url>
|
||||
<sourcepassword>hackme</sourcepassword>
|
||||
<!-- This is what form your output will take. If you are
|
||||
reencoding, this is the format to reencode to, if not
|
||||
then you need to make sure all your input files are in this
|
||||
format. -->
|
||||
<format>MP3</format>
|
||||
<filename>tracks.m3u</filename>
|
||||
<!-- The following settings are used to describe your stream
|
||||
to the server. It's up to you to make sure the
|
||||
bitrate/quality/samplerate/channels
|
||||
match up to your output stream -->
|
||||
<svrinfoname>My Stream</svrinfoname>
|
||||
<svrinfourl>http://www.oddsock.org</svrinfourl>
|
||||
<svrinfogenre>RockNRoll</svrinfogenre>
|
||||
<svrinfodescription>This is a stream description</svrinfodescription>
|
||||
<svrinfobitrate>128</svrinfobitrate>
|
||||
<!-- Quality is only applicable to ogg vorbis streams -->
|
||||
<!-- <svrinfoquality>1.0</svrinfoquality> -->
|
||||
<svrinfochannels>2</svrinfochannels>
|
||||
<svrinfosamplerate>44100</svrinfosamplerate>
|
||||
<svrinfopublic>1</svrinfopublic>
|
||||
<reencode>
|
||||
<enable>1</enable>
|
||||
<!-- Each encdec block specifies a pair of programs used for decoding and
|
||||
encoding of the stream. If reencoding is enabled, then all input files
|
||||
must be first decoded before being sent to the encoder. EZSTREAM uses
|
||||
file extensions to match up input files with the appropraite decoder,
|
||||
and uses the <format> setting to match up the output format with the
|
||||
appropriate encoder.
|
||||
|
||||
Note: It it up to you to set the appropriate bitrate/samplerate/channels
|
||||
of the output stream by using command line paramters to the encoders. Use
|
||||
the examples defined here as a guide. All output from decoders should be in
|
||||
RAW format, and all input to the encoders should also be in RAW format. -->
|
||||
<encdec>
|
||||
<!-- Support for THEORA (ffmpeg2theora does both decoding and encoding
|
||||
so we don't need an encode part) -->
|
||||
<format>THEORA</format>
|
||||
<match>.avi</match>
|
||||
<decode>ffmpeg2theora -x 192 -y 128 -a -1 -v 0 "@T@" -o -</decode>
|
||||
</encdec>
|
||||
<encdec>
|
||||
<!-- Support for THEORA (ffmpeg2theora does both decoding and encoding
|
||||
so we don't need an encode part) -->
|
||||
<format>THEORA</format>
|
||||
<match>.mpg</match>
|
||||
<decode>ffmpeg2theora -a -1 -v 2 "@T@" -o -</decode>
|
||||
</encdec>
|
||||
<encdec>
|
||||
<!-- Support for FLAC decoding (input files) -->
|
||||
<format>FLAC</format>
|
||||
<match>.flac</match>
|
||||
<decode>flac -s -d --force-raw-format --sign=signed --endian=little "@T@" -o -</decode>
|
||||
<encode>Not supported Yet</encode>
|
||||
</encdec>
|
||||
<encdec>
|
||||
<!-- Support for MP3 decoding via madplay, and encoding via LAME -->
|
||||
<format>MP3</format>
|
||||
<match>.mp3</match>
|
||||
<decode>madplay -o raw:- "@T@"</decode>
|
||||
<encode>lame -r -x -b 56 -s 44.1 --resample 22.05 -a - -</encode>
|
||||
</encdec>
|
||||
<encdec>
|
||||
<!-- Support for Vorbis decoding via oggdec, and encoding via oggenc -->
|
||||
<format>VORBIS</format>
|
||||
<match>.ogg</match>
|
||||
<decode>oggdec --raw=1 "@T@" -o -</decode>
|
||||
<encode>oggenc -Q -r -q 0 --resample=44100 --downmix -t "@M@" -c STREAMER=ezstream -</encode>
|
||||
</encdec>
|
||||
<!-- New encdec sections can be added for new input/output formats -->
|
||||
</reencode>
|
||||
</ezstream>
|
||||
58
conf/ezstream_reencoding_example_theora.xml
Normal file
58
conf/ezstream_reencoding_example_theora.xml
Normal file
@ -0,0 +1,58 @@
|
||||
<!-- This example is for a input playlist that can contain
|
||||
avi and mpg (video) files files and a output stream that
|
||||
is OggTheora. The output stream settings (bitrate, channels, etc.)
|
||||
are controlled by the parameters to ffmpeg2theora. (see the decode setting
|
||||
for the THEORA format later in this file). -->
|
||||
<ezstream>
|
||||
<url>http://localhost:8000/theora.ogg</url>
|
||||
<sourcepassword>hackme</sourcepassword>
|
||||
<!-- This is what form your output will take. If you are
|
||||
reencoding, this is the format to reencode to, if not
|
||||
then you need to make sure all your input files are in this
|
||||
format. -->
|
||||
<format>THEORA</format>
|
||||
<filename>tracks.m3u</filename>
|
||||
<!-- The following settings are used to describe your stream
|
||||
to the server. It's up to you to make sure the
|
||||
bitrate/quality/samplerate/channels
|
||||
match up to your output stream -->
|
||||
<svrinfoname>My Stream</svrinfoname>
|
||||
<svrinfourl>http://www.oddsock.org</svrinfourl>
|
||||
<svrinfogenre>RockNRoll</svrinfogenre>
|
||||
<svrinfodescription>This is a stream description</svrinfodescription>
|
||||
<svrinfobitrate>128</svrinfobitrate>
|
||||
<!-- Quality is only applicable to ogg vorbis streams -->
|
||||
<!-- <svrinfoquality>1.0</svrinfoquality> -->
|
||||
<svrinfochannels>2</svrinfochannels>
|
||||
<svrinfosamplerate>44100</svrinfosamplerate>
|
||||
<svrinfopublic>1</svrinfopublic>
|
||||
<reencode>
|
||||
<enable>1</enable>
|
||||
<!-- Each encdec block specifies a pair of programs used for decoding and
|
||||
encoding of the stream. If reencoding is enabled, then all input files
|
||||
must be first decoded before being sent to the encoder. EZSTREAM uses
|
||||
file extensions to match up input files with the appropraite decoder,
|
||||
and uses the <format> setting to match up the output format with the
|
||||
appropriate encoder.
|
||||
|
||||
Note: It it up to you to set the appropriate bitrate/samplerate/channels
|
||||
of the output stream by using command line paramters to the encoders. Use
|
||||
the examples defined here as a guide. All output from decoders should be in
|
||||
RAW format, and all input to the encoders should also be in RAW format. -->
|
||||
<encdec>
|
||||
<!-- Support for THEORA (ffmpeg2theora does both decoding and encoding
|
||||
so we don't need an encode part) -->
|
||||
<format>THEORA</format>
|
||||
<match>.avi</match>
|
||||
<decode>ffmpeg2theora -x 192 -y 128 -a -1 -v 0 "@T@" -o -</decode>
|
||||
</encdec>
|
||||
<encdec>
|
||||
<!-- Support for THEORA (ffmpeg2theora does both decoding and encoding
|
||||
so we don't need an encode part) -->
|
||||
<format>THEORA</format>
|
||||
<match>.mpg</match>
|
||||
<decode>ffmpeg2theora -a -1 -v 2 "@T@" -o -</decode>
|
||||
</encdec>
|
||||
<!-- New encdec sections can be added for new input/output formats -->
|
||||
</reencode>
|
||||
</ezstream>
|
||||
@ -1,10 +1,10 @@
|
||||
<ezstream>
|
||||
<url>http://192.168.6.1:8000/testmount.ogg</url>
|
||||
<url>http://localhost:8000/vorbis.ogg</url>
|
||||
<sourcepassword>hackme</sourcepassword>
|
||||
<!-- This is what form your output will take. If you are
|
||||
reencoding, this is the format to reencode to, if not
|
||||
then you need to make sure all your input files are in this
|
||||
format -->
|
||||
format. -->
|
||||
<format>VORBIS</format>
|
||||
<filename>tracks.m3u</filename>
|
||||
<!-- The following settings are used to describe your stream
|
||||
@ -34,25 +34,39 @@
|
||||
of the output stream by using command line paramters to the encoders. Use
|
||||
the examples defined here as a guide. All output from decoders should be in
|
||||
RAW format, and all input to the encoders should also be in RAW format. -->
|
||||
<encdec>
|
||||
<!-- Support for THEORA (ffmpeg2theora does both decoding and encoding
|
||||
so we don't need an encode part) -->
|
||||
<format>THEORA</format>
|
||||
<match>.avi</match>
|
||||
<decode>ffmpeg2theora -x 192 -y 128 -a -1 -v 0 "@T@" -o -</decode>
|
||||
</encdec>
|
||||
<encdec>
|
||||
<!-- Support for THEORA (ffmpeg2theora does both decoding and encoding
|
||||
so we don't need an encode part) -->
|
||||
<format>THEORA</format>
|
||||
<match>.mpg</match>
|
||||
<decode>ffmpeg2theora -a -1 -v 2 "@T@" -o -</decode>
|
||||
</encdec>
|
||||
<encdec>
|
||||
<!-- Support for FLAC decoding (input files) -->
|
||||
<format>FLAC</format>
|
||||
<match>.flac</match>
|
||||
<decode>flac -s -d --force-raw-format --sign=signed --endian=little @T@ -o -</decode>
|
||||
<decode>flac -s -d --force-raw-format --sign=signed --endian=little "@T@" -o -</decode>
|
||||
<encode>Not supported Yet</encode>
|
||||
</encdec>
|
||||
<encdec>
|
||||
<!-- Support for MP3 decoding via madplay, and encoding via LAME -->
|
||||
<format>MP3</format>
|
||||
<match>.mp3</match>
|
||||
<decode>madplay -o raw:- @T@ 2>/dev/null</decode>
|
||||
<encode>lame -r -x -b 56 -s 44.1 --resample 22.05 -a - - 2>/dev/null</encode>
|
||||
<decode>madplay -o raw:- "@T@"</decode>
|
||||
<encode>lame -r -x -b 56 -s 44.1 --resample 22.05 -a - -</encode>
|
||||
</encdec>
|
||||
<encdec>
|
||||
<!-- Support for Vorbis decoding via oggdec, and encoding via oggenc -->
|
||||
<format>VORBIS</format>
|
||||
<match>.ogg</match>
|
||||
<decode>oggdec --raw=1 @T@ -o - 2>/dev/null</decode>
|
||||
<decode>oggdec --raw=1 "@T@" -o -</decode>
|
||||
<encode>oggenc -Q -r -q 0 --resample=44100 --downmix -t "@M@" -c STREAMER=ezstream -</encode>
|
||||
</encdec>
|
||||
<!-- New encdec sections can be added for new input/output formats -->
|
||||
@ -1,8 +1,12 @@
|
||||
<!-- This example is for a input playlist that must contain
|
||||
all OggVorbis files. ezstream will perform NO reencoding, and
|
||||
the destination stream bitrate, channels, etc. will be those
|
||||
of the input files -->
|
||||
<ezstream>
|
||||
<url>http://localhost:8000/testmount.ogg</url>
|
||||
<url>http://localhost:8000/vorbis.ogg</url>
|
||||
<sourcepassword>hackme</sourcepassword>
|
||||
<format>OGGVORBIS</format>
|
||||
<filename>sunking.ogg</filename>
|
||||
<format>VORBIS</format>
|
||||
<filename>playlist.m3u</filename>
|
||||
<svrinfoname>My Stream</svrinfoname>
|
||||
<svrinfourl>http://www.oddsock.org</svrinfourl>
|
||||
<svrinfogenre>RockNRoll</svrinfogenre>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
AC_INIT([ezstream], [0.1.2], [icecast@xiph.org])
|
||||
AC_INIT([ezstream], [0.2.0], [oddsock@xiph.org])
|
||||
|
||||
AC_PREREQ(2.54)
|
||||
AC_CONFIG_SRCDIR(src/ezstream.c)
|
||||
|
||||
@ -5,7 +5,8 @@
|
||||
#include <string.h>
|
||||
#ifdef WIN32
|
||||
#include <fcntl.h>
|
||||
#include <io.h>
|
||||
#include <io.h>
|
||||
#include <windows.h>
|
||||
#endif
|
||||
#include <shout/shout.h>
|
||||
#include <getopt.h>
|
||||
@ -292,7 +293,8 @@ char * processMetadata(shout_t *shout, char *extension, char *fileName) {
|
||||
FILE *openResource(shout_t *shout, char *fileName)
|
||||
{
|
||||
FILE *filep = NULL;
|
||||
|
||||
|
||||
printf("Opening file (%s)\n", fileName);
|
||||
if (!strcmp(fileName, "stdin")) {
|
||||
#ifdef WIN32
|
||||
_setmode(_fileno(stdin), _O_BINARY);
|
||||
@ -317,7 +319,10 @@ FILE *openResource(shout_t *shout, char *fileName)
|
||||
if (strlen(extension) > 0) {
|
||||
pCommandString = buildCommandString(extension, fileName, pMetadata);
|
||||
/* Open up the decode/encode loop using popen() */
|
||||
filep = popen(pCommandString, "r");
|
||||
filep = popen(pCommandString, "r");
|
||||
#ifdef WIN32
|
||||
_setmode(_fileno(filep), _O_BINARY );
|
||||
#endif
|
||||
free(pMetadata);
|
||||
free(pCommandString);
|
||||
return filep;
|
||||
@ -343,7 +348,7 @@ FILE *openResource(shout_t *shout, char *fileName)
|
||||
int streamFile(shout_t *shout, char *fileName) {
|
||||
FILE *filepstream = NULL;
|
||||
char buff[4096];
|
||||
long read, ret, total;
|
||||
long read, ret, total;
|
||||
|
||||
|
||||
printf("Streaming %s\n", fileName);
|
||||
@ -360,9 +365,27 @@ int streamFile(shout_t *shout, char *fileName) {
|
||||
|
||||
if (read > 0) {
|
||||
ret = shout_send(shout, buff, read);
|
||||
if (ret != SHOUTERR_SUCCESS) {
|
||||
printf("DEBUG: Send error: %s\n", shout_get_error(shout));
|
||||
break;
|
||||
if (ret != SHOUTERR_SUCCESS) {
|
||||
int loop = 1;
|
||||
printf("DEBUG: Send error: %s\n", shout_get_error(shout));
|
||||
|
||||
while (loop) {
|
||||
printf("Disconnected from server, reconnecting....\n");
|
||||
shout_close(shout);
|
||||
if (shout_open(shout) == SHOUTERR_SUCCESS) {
|
||||
printf("Successful reconnection....\n");
|
||||
ret = shout_send(shout, buff, read);
|
||||
loop = 0;
|
||||
}
|
||||
else {
|
||||
printf("Reconnect failed..waiting 5 seconds.\n");
|
||||
#ifdef WIN32
|
||||
Sleep(5000);
|
||||
#else
|
||||
sleep(5);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
shout_delay(shout);
|
||||
} else {
|
||||
@ -373,13 +396,14 @@ int streamFile(shout_t *shout, char *fileName) {
|
||||
}
|
||||
fclose(filepstream);
|
||||
filepstream = NULL;
|
||||
return 1;
|
||||
return ret;
|
||||
}
|
||||
int streamPlaylist(shout_t *shout, char *fileName) {
|
||||
FILE *filep = NULL;
|
||||
char streamFileName[8096] = "";
|
||||
char lastStreamFileName[8096] = "";
|
||||
int loop = 1;
|
||||
int loop = 1;
|
||||
int ret = 1;
|
||||
|
||||
filep = fopen(fileName, "r");
|
||||
if (filep == 0) {
|
||||
@ -396,7 +420,7 @@ int streamPlaylist(shout_t *shout, char *fileName) {
|
||||
strcpy(lastStreamFileName, streamFileName);
|
||||
/* Skip entries that begin with a # */
|
||||
if (strncmp(streamFileName, "#", 1)) {
|
||||
streamFile(shout, streamFileName);
|
||||
streamFile(shout, streamFileName);
|
||||
}
|
||||
}
|
||||
if (rereadPlaylist) {
|
||||
|
||||
@ -42,7 +42,7 @@ RSC=rc.exe
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../libshout/include" /I "../src" /I "../../libxml2/include" /I "../../iconv/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../ogg/include" /I "../../vorbis/include" /I "../../libshout/include" /I "../src" /I "../../libxml2/include" /I "../../iconv/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
# ADD RSC /l 0x409 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
@ -50,7 +50,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\libshout\win32\Release\libshout.lib ..\..\oggvorbis-win32sdk-1.0.1\lib\ogg_static.lib ..\..\oggvorbis-win32sdk-1.0.1\lib\vorbis_static.lib ..\..\pthreads\pthreadVSE.lib ws2_32.lib winmm.lib libxml2.lib iconv.lib vorbisfile.lib /nologo /subsystem:console /machine:I386 /libpath:"../../oggvorbis-win32sdk-1.0.1/lib" /libpath:"../../libshout-2.0/win32/Release" /libpath:"../../libxml2/lib" /libpath:"../../iconv/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\libshout\win32\Release\libshout.lib ogg_static.lib vorbis_static.lib ..\..\pthreads\pthreadVSE.lib ws2_32.lib winmm.lib libxml2.lib iconv.lib vorbisfile_static.lib /nologo /subsystem:console /machine:I386 /libpath:"../../oggvorbis-win32sdk-1.0.1/lib" /libpath:"../../libshout-2.0/win32/Release" /libpath:"../../libxml2/lib" /libpath:"../../iconv/lib" /libpath:"../../ogg/win32/Static_Release" /libpath:"../../vorbis/win32/Vorbis_Static_Release" /libpath:"../../vorbis/win32/VorbisFile_Static_Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "ezstream - Win32 Debug"
|
||||
|
||||
@ -66,7 +66,7 @@ LINK32=link.exe
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../libshout/include" /I "../src" /I "../../libxml2/include" /I "../../iconv/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../ogg/include" /I "../../vorbis/include" /I "../../libshout/include" /I "../src" /I "../../libxml2/include" /I "../../iconv/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
|
||||
# ADD BASE RSC /l 0x409 /d "_DEBUG"
|
||||
# ADD RSC /l 0x409 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
@ -74,7 +74,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\libshout\win32\Debug\libshout.lib ..\..\oggvorbis-win32sdk-1.0.1\lib\ogg_static.lib ..\..\oggvorbis-win32sdk-1.0.1\lib\vorbis_static.lib ..\..\pthreads\pthreadVSE.lib ws2_32.lib winmm.lib libxml2.lib iconv.lib vorbisfile.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../oggvorbis-win32sdk-1.0.1/lib" /libpath:"../../libshout-2.0/win32/Debug" /libpath:"../../libxml2/lib" /libpath:"../../iconv/lib"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\libshout\win32\Debug\libshout.lib ogg_static_d.lib vorbis_static_d.lib ..\..\pthreads\pthreadVSE.lib ws2_32.lib winmm.lib libxml2.lib iconv.lib vorbisfile_static_d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../libshout-2.0/win32/Debug" /libpath:"../../libxml2/lib" /libpath:"../../iconv/lib" /libpath:"../../ogg/win32/Static_Debug" /libpath:"../../vorbis/win32/Vorbis_Static_Debug" /libpath:"../../vorbis/win32/VorbisFile_Static_Debug"
|
||||
|
||||
!ENDIF
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "ezstream"=".\ezstream.dsp" - Package Owner=<4>
|
||||
Project: "ezstream"=.\ezstream.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
@ -14,11 +14,56 @@ Package=<4>
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libshout
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name ogg_static
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name vorbis_static
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name vorbisfile_static
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "libshout"="..\..\libshout-2.0\win32\libshout.dsp" - Package Owner=<4>
|
||||
Project: "libshout"=..\..\libshout\win32\libshout.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "ogg_static"=..\..\ogg\win32\ogg_static.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "vorbis_static"=..\..\vorbis\win32\vorbis_static.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "vorbisfile_static"=..\..\vorbis\win32\vorbisfile_static.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
[Setup]
|
||||
AppName=ezstream
|
||||
AppVerName=ezstream v0.1.1
|
||||
AppVerName=ezstream v0.2.0
|
||||
AppPublisherURL=http://www.icecast.org
|
||||
AppSupportURL=http://www.icecast.org
|
||||
AppUpdatesURL=http://www.icecast.org
|
||||
@ -13,7 +13,7 @@ AllowNoIcons=yes
|
||||
LicenseFile=..\COPYING
|
||||
InfoAfterFile=..\README
|
||||
OutputDir=.
|
||||
OutputBaseFilename=ezstream_win32_0.1.1_setup
|
||||
OutputBaseFilename=ezstream_win32_0.2.0_setup
|
||||
; uncomment the following line if you want your installation to run on NT 3.51 too.
|
||||
; MinVersion=4,3.51
|
||||
|
||||
@ -28,14 +28,12 @@ Name: "{app}"
|
||||
Source: "Release\ezstream.exe"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "..\..\pthreads\pthreadVSE.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "..\conf\ezstream_mp3.xml"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "..\conf\ezstream_m3u.xml"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "..\conf\ezstream_vorbis.xml"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "..\conf\ezstream_reencoding_example.xml"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "..\conf\ezstream_reencoding_example_mp3.xml"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "..\conf\ezstream_reencoding_example_vorbis.xml"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "..\conf\ezstream_reencoding_example_theora.xml"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "..\..\iconv\lib\iconv.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "..\..\libxml2\lib\libxml2.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "..\..\oggvorbis-win32sdk-1.0.1\bin\vorbisfile.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "..\..\oggvorbis-win32sdk-1.0.1\bin\ogg.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "..\..\oggvorbis-win32sdk-1.0.1\bin\vorbis.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||
|
||||
[Icons]
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user