Commit a971f994 authored by Ed "oddsock" Zaleski's avatar Ed "oddsock" Zaleski

removal of some errant newlines

update of icecast.dsp for console build
update of .iss setup build file
removed icecast.xml from this dir (should never have been here)

svn path=/trunk/icecast/; revision=4615
parent 3fb7eb75
...@@ -33,7 +33,7 @@ extern "C" { ...@@ -33,7 +33,7 @@ extern "C" {
#undef THIS_FILE #undef THIS_FILE
static char THIS_FILE[] = __FILE__; static char THIS_FILE[] = __FILE__;
#endif #endif
#define ICECAST_VERSION "2.0alpha1" #define ICECAST_VERSION "2.0alpha1"
CEdit *g_accessControl; CEdit *g_accessControl;
CEdit *g_errorControl; CEdit *g_errorControl;
...@@ -335,10 +335,11 @@ BOOL CIcecast2winDlg::OnInitDialog() ...@@ -335,10 +335,11 @@ BOOL CIcecast2winDlg::OnInitDialog()
m_pTray = NULL; m_pTray = NULL;
char version[255] = ""; char version[255] = "";
sprintf(version, "Icecast2 Version %s", ICECAST_VERSION); sprintf(version, "Icecast2 Version %s", ICECAST_VERSION);
SetWindowText(version); SetWindowText(version);
if (m_Autostart) { if (m_Autostart) {
OnStart(); OnStart();
} }
...@@ -627,6 +628,7 @@ void StartServer(void *configfile) ...@@ -627,6 +628,7 @@ void StartServer(void *configfile)
argv[1] = "-c"; argv[1] = "-c";
argv[2] = g_configFile; argv[2] = g_configFile;
time(&(g_mainDialog->serverStart)); time(&(g_mainDialog->serverStart));
int ret = main(argc, (char **)argv); int ret = main(argc, (char **)argv);
if (ret) { if (ret) {
MessageBox(NULL, "Unable to start server", NULL, MB_OK); MessageBox(NULL, "Unable to start server", NULL, MB_OK);
...@@ -685,7 +687,7 @@ void CIcecast2winDlg::OnStart() ...@@ -685,7 +687,7 @@ void CIcecast2winDlg::OnStart()
CIcecast2winApp *myApp = (CIcecast2winApp *)AfxGetApp(); CIcecast2winApp *myApp = (CIcecast2winApp *)AfxGetApp();
// TODO: Add your control notification handler code here // TODO: Add your control notification handler code here
if (global.running == ICE_RUNNING) { if (global.running == ICE_RUNNING) {
StopServer(); StopServer();
} }
......
...@@ -47,6 +47,7 @@ public: ...@@ -47,6 +47,7 @@ public:
void StopServer(); void StopServer();
bool m_isRunning; bool m_isRunning;
void DisableControl(UINT control); void DisableControl(UINT control);
......
...@@ -41,7 +41,7 @@ RSC=rc.exe ...@@ -41,7 +41,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "Releaseicecast" # PROP Intermediate_Dir "Releaseicecast"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MT /W3 /GX /O2 /I "../" /I "../../libxslt/include" /I "../../curl/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD CPP /nologo /MT /W3 /GX /O2 /I "../" /I "../../libxslt/include" /I "../../curl/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_CURL" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
...@@ -64,7 +64,7 @@ LIB32=link.exe -lib ...@@ -64,7 +64,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "Debugicecast" # PROP Intermediate_Dir "Debugicecast"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../" /I "../../libxslt/include" /I "../../curl/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /FD /GZ /c # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../" /I "../../libxslt/include" /I "../../curl/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /D "HAVE_CURL" /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
......
<icecast>
<location>Nowhere</location>
<admin>jack@icecast.org</admin>
<limits>
<clients>100</clients>
<sources>2</sources>
<threadpool>5</threadpool>
<client-timeout>30</client-timeout>
<header-timeout>15</header-timeout>
<source-timeout>10</source-timeout>
</limits>
<source-password>hackme</source-password>
<directory>
<touch-freq>5</touch-freq>
<server>
<host>yp.icecast.org</host>
<touch-freq>15</touch-freq>
</server>
</directory>
<hostname>localhost</hostname>
<port>8000</port>
<!--<bind-address>127.0.0.1</bind-address>-->
<!--<master-server>127.0.0.1</master-server>-->
<!--<master-server-port>8001</master-server-port>-->
<!--<master-update-interval>120</master-update-interval>-->
<paths>
<basedir>.</basedir>
<logdir>.</logdir>
<webroot>.\web</webroot>
</paths>
<logging>
<accesslog>access.log</accesslog>
<errorlog>error.log</errorlog>
<!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
<loglevel>4</loglevel>
</logging>
</icecast>
...@@ -13,7 +13,7 @@ AllowNoIcons=yes ...@@ -13,7 +13,7 @@ AllowNoIcons=yes
LicenseFile=..\COPYING LicenseFile=..\COPYING
InfoAfterFile=..\README InfoAfterFile=..\README
OutputDir=. OutputDir=.
OutputBaseFilename=Icecast2_win32_2.0_03192003_setup OutputBaseFilename=Icecast2_win32_2.0_04122003_setup
WizardImageFile=icecast2logo2.bmp WizardImageFile=icecast2logo2.bmp
; uncomment the following line if you want your installation to run on NT 3.51 too. ; uncomment the following line if you want your installation to run on NT 3.51 too.
; MinVersion=4,3.51 ; MinVersion=4,3.51
...@@ -29,6 +29,8 @@ Name: "{app}\logs" ...@@ -29,6 +29,8 @@ Name: "{app}\logs"
[Files] [Files]
Source: "Release\Icecast2.exe"; DestDir: "{app}"; CopyMode: alwaysoverwrite Source: "Release\Icecast2.exe"; DestDir: "{app}"; CopyMode: alwaysoverwrite
Source: "Release\icecast2console.exe"; DestDir: "{app}"; CopyMode: alwaysoverwrite
Source: "icecast2.bat"; DestDir: "{app}"; CopyMode: alwaysoverwrite
Source: "..\doc\icecast2.chm"; DestDir: "{app}\doc"; CopyMode: alwaysoverwrite Source: "..\doc\icecast2.chm"; DestDir: "{app}\doc"; CopyMode: alwaysoverwrite
Source: "..\web\status.xsl"; DestDir: "{app}\web"; CopyMode: alwaysoverwrite Source: "..\web\status.xsl"; DestDir: "{app}\web"; CopyMode: alwaysoverwrite
Source: "..\web\status2.xsl"; DestDir: "{app}\web"; CopyMode: alwaysoverwrite Source: "..\web\status2.xsl"; DestDir: "{app}\web"; CopyMode: alwaysoverwrite
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment