oddsock's win32 port/GUI

svn path=/trunk/icecast/; revision=3787

AUTHORS

 Jack Moffitt <jack@icecast.org>
+Michael Smith <msmith@icecast.org>
+oddsock <oddsock@oddsock.org>
+

TODO

@@ -2,15 +2,9 @@ BUGS
 ----
 - stats get off?  this needs testing more testing.
 
-- seem to be some segfaults in httpp still.  in a few of the cores i've
-	been sent, the avl_tree is null when calling into the avl module.
-
-- ensure we don't connect a source if the fd would be more then FD_SETSIZE
-  (1024, on linux). Otherwise memory gets overrun, and crashes result. 
-  Preferably allow using poll() instead of select() through a lightweight
-  abstraction.
-
+- autoconf doesn't set HAS_POLL 
 
+- automake isn't installing things (conf, web) correctly.
 
 
 FEATURES

conf/Makefile.am

@@ -5,8 +5,8 @@ AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = icecast.xml
 
 debug:
-        $(MAKE) all CFLAGS="@DEBUG@"
+	$(MAKE) all CFLAGS="@DEBUG@"
 
 profile:
-        $(MAKE) all CFLAGS="@PROFILE@"
+	$(MAKE) all CFLAGS="@PROFILE@"
 

conf/icecast.xml

@@ -32,7 +32,7 @@
         <paths>
                 <basedir>/usr/local/icecast</basedir>
                 <logdir>/tmp</logdir>
-                <webroot>/usr/local/icecast/webroot</webroot>
+                <webroot>/usr/local/icecast/web</webroot>
         </paths>
 
 	<logging>

web/status.xsl

@@ -94,7 +94,7 @@ a:hover {color: black; font-family:Verdana}
 </td>
 <td>
 <font class="default2">
-<b><xsl:value-of select="description" /></b>
+<b><xsl:value-of select="name" /></b>
 </font>
 </td>
 </tr>
@@ -104,7 +104,17 @@ a:hover {color: black; font-family:Verdana}
 </td>
 <td>
 <font class="default2">
-<b></b>
+<b><xsl:value-of select="genre" /></b>
+</font>
+</td>
+</tr>
+<tr>
+<td width="100" >
+<font class="default1">Stream Description: </font>
+</td>
+<td>
+<font class="default2">
+<b><xsl:value-of select="description" /></b>
 </font>
 </td>
 </tr>

win32/ConfigTab.cpp

+// ConfigTab.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "Icecast2win.h"
+#include "ConfigTab.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CConfigTab dialog
+
+
+CConfigTab::CConfigTab(CWnd* pParent /*=NULL*/)
+	: CTabPageSSL(CConfigTab::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(CConfigTab)
+	m_Config = _T("");
+	//}}AFX_DATA_INIT
+}
+
+
+void CConfigTab::DoDataExchange(CDataExchange* pDX)
+{
+	CTabPageSSL::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CConfigTab)
+	DDX_Control(pDX, IDC_CONFIG, m_ConfigCtrl);
+	DDX_Text(pDX, IDC_CONFIG, m_Config);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(CConfigTab, CTabPageSSL)
+	//{{AFX_MSG_MAP(CConfigTab)
+	ON_EN_KILLFOCUS(IDC_CONFIG, OnKillfocusConfig)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CConfigTab message handlers
+
+void CConfigTab::SaveConfiguration()
+{
+	// TODO: Add your command handler code here
+	// TODO: Add your control notification handler code here
+	FILE	*filep;
+	char	buffer[2046] = "";
+	CIcecast2winApp	*myApp = (CIcecast2winApp *)AfxGetApp();
+
+	UpdateData(TRUE);
+	if (m_Config != "") {
+		filep = fopen(myApp->m_configFile, "w");
+		if (filep) {
+			fputs(LPCSTR(m_Config), filep);
+			fclose(filep);
+		}
+	}
+}
+
+BOOL CConfigTab::OnInitDialog() 
+{
+	CTabPageSSL::OnInitDialog();
+	
+	// TODO: Add extra initialization here
+	AddAnchor(IDC_CONFIG, TOP_LEFT, BOTTOM_RIGHT);
+
+	return TRUE;  // return TRUE unless you set the focus to a control
+	              // EXCEPTION: OCX Property Pages should return FALSE
+}
+
+void CConfigTab::OnKillfocusConfig() 
+{
+	// TODO: Add your control notification handler code here
+	SaveConfiguration();
+}

win32/ConfigTab.h

+#if !defined(AFX_CONFIGTAB_H__D8B0CC28_59FA_44E8_91A4_377C64F67DCF__INCLUDED_)
+#define AFX_CONFIGTAB_H__D8B0CC28_59FA_44E8_91A4_377C64F67DCF__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+// ConfigTab.h : header file
+//
+#include "TabPageSSL.h"
+
+/////////////////////////////////////////////////////////////////////////////
+// CConfigTab dialog
+
+class CConfigTab : public CTabPageSSL
+{
+// Construction
+public:
+	void SaveConfiguration();
+	CConfigTab(CWnd* pParent = NULL);   // standard constructor
+
+// Dialog Data
+	//{{AFX_DATA(CConfigTab)
+	enum { IDD = IDD_CONFIGDIALOG };
+	CEdit	m_ConfigCtrl;
+	CString	m_Config;
+	//}}AFX_DATA
+
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CConfigTab)
+	protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+// Implementation
+protected:
+
+	// Generated message map functions
+	//{{AFX_MSG(CConfigTab)
+	virtual BOOL OnInitDialog();
+	afx_msg void OnKillfocusConfig();
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_CONFIGTAB_H__D8B0CC28_59FA_44E8_91A4_377C64F67DCF__INCLUDED_)

win32/Icecast2win.cpp

+// Icecast2win.cpp : Defines the class behaviors for the application.
+//
+
+#include "stdafx.h"
+#include "Icecast2win.h"
+#include "Icecast2winDlg.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CIcecast2winApp
+
+BEGIN_MESSAGE_MAP(CIcecast2winApp, CWinApp)
+	//{{AFX_MSG_MAP(CIcecast2winApp)
+		// NOTE - the ClassWizard will add and remove mapping macros here.
+		//    DO NOT EDIT what you see in these blocks of generated code!
+	//}}AFX_MSG
+	ON_COMMAND(ID_HELP, CWinApp::OnHelp)
+END_MESSAGE_MAP()
+
+#include "colors.h"
+/////////////////////////////////////////////////////////////////////////////
+// CIcecast2winApp construction
+
+CIcecast2winApp::CIcecast2winApp()
+{
+	// TODO: add construction code here,
+	// Place all significant initialization in InitInstance
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// The one and only CIcecast2winApp object
+
+CIcecast2winApp theApp;
+
+/////////////////////////////////////////////////////////////////////////////
+// CIcecast2winApp initialization
+
+BOOL CIcecast2winApp::InitInstance()
+{
+	AfxEnableControlContainer();
+
+	// Standard initialization
+	// If you are not using these features and wish to reduce the size
+	//  of your final executable, you should remove from the following
+	//  the specific initialization routines you do not need.
+
+	if (strlen(m_lpCmdLine) > 0) {
+		strcpy(m_configFile, m_lpCmdLine);
+	}
+	else {
+		strcpy(m_configFile, ".\\icecast.xml");
+	}
+
+
+
+#ifdef _AFXDLL
+	Enable3dControls();			// Call this when using MFC in a shared DLL
+#else
+	Enable3dControlsStatic();	// Call this when linking to MFC statically
+#endif
+
+	CIcecast2winDlg dlg;
+	m_pMainWnd = &dlg;
+
+//	SetDialogBkColor(BGCOLOR,TEXTCOLOR); 
+
+	int nResponse = dlg.DoModal();
+	if (nResponse == IDOK)
+	{
+		// TODO: Place code here to handle when the dialog is
+		//  dismissed with OK
+	}
+	else if (nResponse == IDCANCEL)
+	{
+		// TODO: Place code here to handle when the dialog is
+		//  dismissed with Cancel
+	}
+
+	// Since the dialog has been closed, return FALSE so that we exit the
+	//  application, rather than start the application's message pump.
+	return FALSE;
+}

win32/Icecast2win.dsp

+# Microsoft Developer Studio Project File - Name="Icecast2win" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=Icecast2win - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "Icecast2win.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "Icecast2win.mak" CFG="Icecast2win - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Icecast2win - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "Icecast2win - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Icecast2win - Win32 Release"
+
+# PROP BASE Use_MFC 5
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 5
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../" /I "../../libxslt/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 "../../ogg/include" /I "../../vorbis/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
+# ADD LINK32 Releaseicecast\icecast.lib ..\..\ogg\win32\Static_Release\ogg_static.lib ..\..\vorbis\win32\Vorbis_Static_Release\vorbis_static.lib ..\..\libxml2\lib\libxml2.lib ..\..\libxslt\lib\libxslt.lib ..\..\iconv\lib\iconv.lib ..\..\pthreads\pthreadVSE.lib ws2_32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/Icecast2.exe"
+
+!ELSEIF  "$(CFG)" == "Icecast2win - Win32 Debug"
+
+# PROP BASE Use_MFC 5
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 6
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../" /I "../../libxslt/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 "../../ogg/include" /I "../../vorbis/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_WIN32" /D "_AFXDLL" /FD /GZ /c
+# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 Debugicecast\icecast.lib ..\..\..\ogg\win32\Static_Debug\ogg_static_d.lib ..\..\..\vorbis\win32\Vorbis_Static_Debug\vorbis_static_d.lib ..\..\libxml2\lib\libxml2.lib ..\..\libxslt\lib\libxslt.lib ..\..\iconv\lib\iconv.lib ..\..\pthreads\pthreadVSE.lib ws2_32.lib winmm.lib /nologo /subsystem:windows /incremental:no /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"LIBCMTD.lib" /pdbtype:sept
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Icecast2win - Win32 Release"
+# Name "Icecast2win - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\ConfigTab.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Icecast2win.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Icecast2win.rc
+# End Source File
+# Begin Source File
+
+SOURCE=.\Icecast2winDlg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ResizableDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ResizableDialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\StatsTab.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Status.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.cpp
+# ADD CPP /Yc"stdafx.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\TabCtrlSSL.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TabCtrlSSL.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\TabPageSSL.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TabPageSSL.h
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\colors.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ConfigTab.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Icecast2win.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Icecast2winDlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\StatsTab.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Status.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\bitmap1.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\bitmap2.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\black.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\cursor1.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\cursor2.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\green1.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\icecast.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\Icecast2.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\res\Icecast2.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\icecast2logo.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\icecast2logo2.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\res\Icecast2win.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\res\Icecast2win.rc2
+# End Source File
+# Begin Source File
+
+SOURCE=.\ico00001.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\icon1.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\icon2.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\running.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\stopped.bmp
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=.\ReadMe.txt
+# End Source File
+# End Target
+# End Project

win32/Icecast2win.dsw

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "Icecast2win"=.\Icecast2win.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libxml
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name icecast
+    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
+}}}
+
+###############################################################################
+
+Project: "icecast"=.\icecast.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>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

win32/Icecast2win.h

+// Icecast2win.h : main header file for the ICECAST2WIN application
+//
+
+#if !defined(AFX_ICECAST2WIN_H__76A528C9_A424_4417_BFDF_0E556A9EE4F1__INCLUDED_)
+#define AFX_ICECAST2WIN_H__76A528C9_A424_4417_BFDF_0E556A9EE4F1__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#ifndef __AFXWIN_H__	
+#error include 'stdafx.h' before including this file for PCH
+#endif
+
+#include "resource.h"		// main symbols
+
+/////////////////////////////////////////////////////////////////////////////
+// CIcecast2winApp:
+// See Icecast2win.cpp for the implementation of this class
+//
+
+class CIcecast2winApp : public CWinApp
+{
+public:
+	char m_configFile[1024];
+	CIcecast2winApp();
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CIcecast2winApp)
+	public:
+	virtual BOOL InitInstance();
+	//}}AFX_VIRTUAL