From a971f994c14977382183bb4c7bc77e77fa98efb0 Mon Sep 17 00:00:00 2001 From: oddsock Date: Thu, 17 Apr 2003 03:37:16 +0000 Subject: [PATCH] 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 --- win32/Icecast2winDlg.cpp | 14 +++++++------ win32/Icecast2winDlg.h | 1 + win32/icecast.dsp | 4 ++-- win32/icecast.xml | 45 ---------------------------------------- win32/icecast2.iss | 4 +++- 5 files changed, 14 insertions(+), 54 deletions(-) delete mode 100644 win32/icecast.xml diff --git a/win32/Icecast2winDlg.cpp b/win32/Icecast2winDlg.cpp index a2995c80..8b66c969 100644 --- a/win32/Icecast2winDlg.cpp +++ b/win32/Icecast2winDlg.cpp @@ -33,7 +33,7 @@ extern "C" { #undef THIS_FILE static char THIS_FILE[] = __FILE__; #endif - + #define ICECAST_VERSION "2.0alpha1" CEdit *g_accessControl; CEdit *g_errorControl; @@ -335,10 +335,11 @@ BOOL CIcecast2winDlg::OnInitDialog() m_pTray = NULL; - char version[255] = ""; - sprintf(version, "Icecast2 Version %s", ICECAST_VERSION); - SetWindowText(version); - + char version[255] = ""; + sprintf(version, "Icecast2 Version %s", ICECAST_VERSION); + SetWindowText(version); + + if (m_Autostart) { OnStart(); } @@ -627,6 +628,7 @@ void StartServer(void *configfile) argv[1] = "-c"; argv[2] = g_configFile; time(&(g_mainDialog->serverStart)); + int ret = main(argc, (char **)argv); if (ret) { MessageBox(NULL, "Unable to start server", NULL, MB_OK); @@ -685,7 +687,7 @@ void CIcecast2winDlg::OnStart() CIcecast2winApp *myApp = (CIcecast2winApp *)AfxGetApp(); // TODO: Add your control notification handler code here - + if (global.running == ICE_RUNNING) { StopServer(); } diff --git a/win32/Icecast2winDlg.h b/win32/Icecast2winDlg.h index 83bbefa2..0a5857e8 100644 --- a/win32/Icecast2winDlg.h +++ b/win32/Icecast2winDlg.h @@ -47,6 +47,7 @@ public: + void StopServer(); bool m_isRunning; void DisableControl(UINT control); diff --git a/win32/icecast.dsp b/win32/icecast.dsp index 1e607df3..620dfce2 100644 --- a/win32/icecast.dsp +++ b/win32/icecast.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Releaseicecast" # PROP Target_Dir "" # 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 RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -64,7 +64,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debugicecast" # 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 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 RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/win32/icecast.xml b/win32/icecast.xml deleted file mode 100644 index a90db96f..00000000 --- a/win32/icecast.xml +++ /dev/null @@ -1,45 +0,0 @@ - - Nowhere - jack@icecast.org - - - 100 - 2 - 5 - 30 - 15 - 10 - - - hackme - - - 5 - - yp.icecast.org - 15 - - - - localhost - 8000 - - - - - - - - . - . - .\web - - - - access.log - error.log - - 4 - - - diff --git a/win32/icecast2.iss b/win32/icecast2.iss index 39c3bd80..3ec02bb2 100644 --- a/win32/icecast2.iss +++ b/win32/icecast2.iss @@ -13,7 +13,7 @@ AllowNoIcons=yes LicenseFile=..\COPYING InfoAfterFile=..\README OutputDir=. -OutputBaseFilename=Icecast2_win32_2.0_03192003_setup +OutputBaseFilename=Icecast2_win32_2.0_04122003_setup WizardImageFile=icecast2logo2.bmp ; uncomment the following line if you want your installation to run on NT 3.51 too. ; MinVersion=4,3.51 @@ -29,6 +29,8 @@ Name: "{app}\logs" [Files] 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: "..\web\status.xsl"; DestDir: "{app}\web"; CopyMode: alwaysoverwrite Source: "..\web\status2.xsl"; DestDir: "{app}\web"; CopyMode: alwaysoverwrite -- GitLab