[xiph-cvs] cvs commit: icecast/win32 Icecast2winDlg.cpp Icecast2winDlg.h icecast.dsp icecast2.iss icecast.xml
Ed
oddsock at xiph.org
Wed Apr 16 20:37:16 PDT 2003
oddsock 03/04/16 23:37:16
Modified: win32 Icecast2winDlg.cpp Icecast2winDlg.h icecast.dsp
icecast2.iss
Removed: win32 icecast.xml
Log:
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)
Revision Changes Path
1.6 +8 -6 icecast/win32/Icecast2winDlg.cpp
Index: Icecast2winDlg.cpp
===================================================================
RCS file: /usr/local/cvsroot/icecast/win32/Icecast2winDlg.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Icecast2winDlg.cpp 23 Nov 2002 15:54:50 -0000 1.5
+++ Icecast2winDlg.cpp 17 Apr 2003 03:37:16 -0000 1.6
@@ -33,7 +33,7 @@
#undef THIS_FILE
static char THIS_FILE[] = __FILE__;
#endif
-
+
#define ICECAST_VERSION "2.0alpha1"
CEdit *g_accessControl;
CEdit *g_errorControl;
@@ -335,10 +335,11 @@
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 @@
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 @@
CIcecast2winApp *myApp = (CIcecast2winApp *)AfxGetApp();
// TODO: Add your control notification handler code here
-
+
if (global.running == ICE_RUNNING) {
StopServer();
}
<p><p>1.5 +1 -0 icecast/win32/Icecast2winDlg.h
Index: Icecast2winDlg.h
===================================================================
RCS file: /usr/local/cvsroot/icecast/win32/Icecast2winDlg.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Icecast2winDlg.h 28 Aug 2002 20:37:44 -0000 1.4
+++ Icecast2winDlg.h 17 Apr 2003 03:37:16 -0000 1.5
@@ -47,6 +47,7 @@
+
void StopServer();
bool m_isRunning;
void DisableControl(UINT control);
<p><p>1.8 +2 -2 icecast/win32/icecast.dsp
Index: icecast.dsp
===================================================================
RCS file: /usr/local/cvsroot/icecast/win32/icecast.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- icecast.dsp 19 Mar 2003 15:58:16 -0000 1.7
+++ icecast.dsp 17 Apr 2003 03:37:16 -0000 1.8
@@ -41,7 +41,7 @@
# 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 @@
# 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
<p><p>1.10 +3 -1 icecast/win32/icecast2.iss
Index: icecast2.iss
===================================================================
RCS file: /usr/local/cvsroot/icecast/win32/icecast2.iss,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- icecast2.iss 19 Mar 2003 15:58:16 -0000 1.9
+++ icecast2.iss 17 Apr 2003 03:37:16 -0000 1.10
@@ -13,7 +13,7 @@
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 @@
[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
<p><p>--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list