mirror of
https://gitlab.xiph.org/xiph/icecast-server.git
synced 2024-09-29 04:25:55 -04:00
resync with trunk, mainly win32 build and fallback css mime type fix
svn path=/icecast/branches/kh/icecast/; revision=8155
This commit is contained in:
parent
bd3b94c9ba
commit
452e389213
@ -85,7 +85,7 @@ typedef struct {
|
||||
static int _free_client(void *key);
|
||||
static int _delete_mapping(void *mapping);
|
||||
static void *fserv_thread_function(void *arg);
|
||||
static void create_mime_mappings(char *fn);
|
||||
static void create_mime_mappings(const char *fn);
|
||||
|
||||
void fserve_initialize(void)
|
||||
{
|
||||
@ -330,6 +330,8 @@ static char *fserve_content_type(char *path)
|
||||
return "audio/mpeg";
|
||||
else if(!strcmp(ext, "html"))
|
||||
return "text/html";
|
||||
else if(!strcmp(ext, "css"))
|
||||
return "text/css";
|
||||
else if(!strcmp(ext, "txt"))
|
||||
return "text/plain";
|
||||
else
|
||||
@ -437,7 +439,7 @@ static int _compare_mappings(void *arg, void *a, void *b)
|
||||
((mime_type *)b)->ext);
|
||||
}
|
||||
|
||||
static void create_mime_mappings(char *fn) {
|
||||
static void create_mime_mappings(const char *fn) {
|
||||
FILE *mimefile = fopen(fn, "r");
|
||||
char line[4096];
|
||||
char *type, *ext, *cur;
|
||||
|
@ -66,7 +66,7 @@ BOOL CConfigTab::OnInitDialog()
|
||||
CTabPageSSL::OnInitDialog();
|
||||
|
||||
// TODO: Add extra initialization here
|
||||
AddAnchor(IDC_CONFIG, TOP_LEFT, BOTTOM_RIGHT);
|
||||
// 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
|
||||
|
@ -1,31 +1,31 @@
|
||||
; CLW file contains information for the MFC ClassWizard
|
||||
|
||||
[General Info]
|
||||
Version=1
|
||||
LastClass=CStatus
|
||||
LastTemplate=CDialog
|
||||
NewFileInclude1=#include "stdafx.h"
|
||||
NewFileInclude2=#include "Icecast2win.h"
|
||||
Version=1
|
||||
LastClass=CStatus
|
||||
LastTemplate=CDialog
|
||||
NewFileInclude1=#include "stdafx.h"
|
||||
NewFileInclude2=#include "Icecast2win.h"
|
||||
|
||||
ClassCount=6
|
||||
Class1=CIcecast2winApp
|
||||
Class2=CIcecast2winDlg
|
||||
Class3=CAboutDlg
|
||||
ClassCount=6
|
||||
Class1=CIcecast2winApp
|
||||
Class2=CIcecast2winDlg
|
||||
Class3=CAboutDlg
|
||||
|
||||
ResourceCount=10
|
||||
Resource1=IDD_SSTATUS
|
||||
Resource2=IDR_MAINFRAME
|
||||
Resource3=IDD_ABOUTBOX
|
||||
Resource4=IDR_MENU2
|
||||
Class4=CStatus
|
||||
Resource5=IDR_TRAY
|
||||
Class5=CConfigTab
|
||||
Class6=CStatsTab
|
||||
Resource6=IDR_MENU4
|
||||
Resource7=IDD_ICECAST2WIN_DIALOG
|
||||
Resource8=IDD_CONFIGDIALOG
|
||||
Resource9=IDR_MENU3
|
||||
Resource10=IDD_STATSDIALOG
|
||||
ResourceCount=10
|
||||
Resource1=IDD_SSTATUS
|
||||
Resource2=IDR_MAINFRAME
|
||||
Resource3=IDD_STATSDIALOG
|
||||
Resource4=IDR_MENU2
|
||||
Class4=CStatus
|
||||
Resource5=IDR_TRAY
|
||||
Class5=CConfigTab
|
||||
Class6=CStatsTab
|
||||
Resource6=IDR_MENU4
|
||||
Resource7=IDD_ICECAST2WIN_DIALOG
|
||||
Resource8=IDD_CONFIGDIALOG
|
||||
Resource9=IDR_MENU3
|
||||
Resource10=IDD_ABOUTBOX
|
||||
|
||||
[CLS:CIcecast2winApp]
|
||||
Type=0
|
||||
@ -48,37 +48,37 @@ HeaderFile=Icecast2winDlg.h
|
||||
ImplementationFile=Icecast2winDlg.cpp
|
||||
Filter=D
|
||||
|
||||
[DLG:IDD_ABOUTBOX]
|
||||
Type=1
|
||||
Class=CAboutDlg
|
||||
ControlCount=3
|
||||
Control1=IDC_STATIC,static,1342177283
|
||||
Control2=IDC_STATIC,static,1342308480
|
||||
Control3=IDOK,button,1342373889
|
||||
|
||||
[DLG:IDD_ICECAST2WIN_DIALOG]
|
||||
Type=1
|
||||
Class=CIcecast2winDlg
|
||||
ControlCount=8
|
||||
Control1=IDC_MAINTAB,SysTabControl32,1342177280
|
||||
Control2=IDC_START,button,1342242816
|
||||
Control3=IDC_AUTOSTART,button,1342251011
|
||||
Control4=IDC_STATIC,static,1342177294
|
||||
Control5=IDC_SERVERSTATUS,static,1342177294
|
||||
Control6=IDC_STATIC_SS,static,1342308865
|
||||
Control7=IDC_STATICBLACK,static,1342177294
|
||||
Control8=IDC_HIDESYSTRAY,button,1342242816
|
||||
|
||||
[DLG:IDD_SSTATUS]
|
||||
Type=1
|
||||
Class=CStatus
|
||||
ControlCount=5
|
||||
Control1=IDC_FILLER2,static,1342308352
|
||||
Control2=IDC_GLOBALSTAT_LIST,SysListView32,1350631425
|
||||
Control3=IDC_STATIC_GS,static,1342308353
|
||||
Control4=IDC_STATIC_RUN,static,1342308352
|
||||
Control5=IDC_RUNNINGFOR,static,1342308352
|
||||
|
||||
[DLG:IDD_ABOUTBOX]
|
||||
Type=1
|
||||
Class=CAboutDlg
|
||||
ControlCount=3
|
||||
Control1=IDC_STATIC,static,1342177283
|
||||
Control2=IDC_STATIC,static,1342308480
|
||||
Control3=IDOK,button,1342373889
|
||||
|
||||
[DLG:IDD_ICECAST2WIN_DIALOG]
|
||||
Type=1
|
||||
Class=CIcecast2winDlg
|
||||
ControlCount=8
|
||||
Control1=IDC_MAINTAB,SysTabControl32,1342177280
|
||||
Control2=IDC_START,button,1342242816
|
||||
Control3=IDC_AUTOSTART,button,1342251011
|
||||
Control4=IDC_STATIC,static,1342177294
|
||||
Control5=IDC_SERVERSTATUS,static,1342177294
|
||||
Control6=IDC_STATIC_SS,static,1342308865
|
||||
Control7=IDC_STATICBLACK,static,1342177294
|
||||
Control8=IDC_HIDESYSTRAY,button,1342242816
|
||||
|
||||
[DLG:IDD_SSTATUS]
|
||||
Type=1
|
||||
Class=CStatus
|
||||
ControlCount=5
|
||||
Control1=IDC_FILLER2,static,1342308352
|
||||
Control2=IDC_GLOBALSTAT_LIST,SysListView32,1350631425
|
||||
Control3=IDC_STATIC_GS,static,1342308352
|
||||
Control4=IDC_STATIC_RUN,static,1342308352
|
||||
Control5=IDC_RUNNINGFOR,static,1342308352
|
||||
|
||||
[CLS:CStatus]
|
||||
Type=0
|
||||
HeaderFile=Status.h
|
||||
@ -88,12 +88,12 @@ Filter=D
|
||||
LastObject=ID_POPUP_ADDTOGLOBALSTATLIST
|
||||
VirtualFilter=dWC
|
||||
|
||||
[DLG:IDD_CONFIGDIALOG]
|
||||
Type=1
|
||||
Class=CConfigTab
|
||||
ControlCount=1
|
||||
Control1=IDC_CONFIG,edit,1352732868
|
||||
|
||||
[DLG:IDD_CONFIGDIALOG]
|
||||
Type=1
|
||||
Class=CConfigTab
|
||||
ControlCount=1
|
||||
Control1=IDC_CONFIG,edit,1352732868
|
||||
|
||||
[CLS:CConfigTab]
|
||||
Type=0
|
||||
HeaderFile=ConfigTab.h
|
||||
@ -103,16 +103,15 @@ Filter=D
|
||||
VirtualFilter=dWC
|
||||
LastObject=IDC_CONFIG
|
||||
|
||||
[DLG:IDD_STATSDIALOG]
|
||||
Type=1
|
||||
Class=CStatsTab
|
||||
ControlCount=5
|
||||
Control1=IDC_STATSLIST,SysListView32,1350631425
|
||||
Control2=IDC_SOURCELIST,SysListView32,1350631425
|
||||
Control3=IDC_FILLER1,static,1342308352
|
||||
Control4=IDC_STATIC_SLS,static,1342308353
|
||||
Control5=IDC_STATIC,static,1342308352
|
||||
|
||||
[DLG:IDD_STATSDIALOG]
|
||||
Type=1
|
||||
Class=CStatsTab
|
||||
ControlCount=4
|
||||
Control1=IDC_STATSLIST,SysListView32,1350631425
|
||||
Control2=IDC_SOURCELIST,SysListView32,1350631425
|
||||
Control3=IDC_STATIC_SLS,static,1342308352
|
||||
Control4=IDC_STATIC,static,1342308352
|
||||
|
||||
[CLS:CStatsTab]
|
||||
Type=0
|
||||
HeaderFile=StatsTab.h
|
||||
@ -122,31 +121,31 @@ Filter=D
|
||||
VirtualFilter=dWC
|
||||
LastObject=IDC_SOURCELIST
|
||||
|
||||
[MNU:IDR_MENU2]
|
||||
Type=1
|
||||
Class=?
|
||||
Command1=ID_POPUP_ADDTOGLOBALSTATLIST
|
||||
CommandCount=1
|
||||
|
||||
[MNU:IDR_MENU3]
|
||||
Type=1
|
||||
Class=?
|
||||
Command1=ID__DELETEFROMGLOBALSTATS
|
||||
Command2=ID__MAKETHISSTATTHEWINDOWTITLE
|
||||
CommandCount=2
|
||||
|
||||
[MNU:IDR_TRAY]
|
||||
Type=1
|
||||
Class=CIcecast2winDlg
|
||||
Command1=ID_BLANK_RESTORE
|
||||
CommandCount=1
|
||||
|
||||
[MNU:IDR_MENU4]
|
||||
Type=1
|
||||
Class=CIcecast2winDlg
|
||||
Command1=ID_FILE_EXIT
|
||||
Command2=ID_FILE_EDITCONFIGURATION
|
||||
Command3=ID_ABOUT_HELP
|
||||
Command4=ID_ABOUT_CREDITS
|
||||
CommandCount=4
|
||||
|
||||
[MNU:IDR_MENU2]
|
||||
Type=1
|
||||
Class=?
|
||||
Command1=ID_POPUP_ADDTOGLOBALSTATLIST
|
||||
CommandCount=1
|
||||
|
||||
[MNU:IDR_MENU3]
|
||||
Type=1
|
||||
Class=?
|
||||
Command1=ID__DELETEFROMGLOBALSTATS
|
||||
Command2=ID__MAKETHISSTATTHEWINDOWTITLE
|
||||
CommandCount=2
|
||||
|
||||
[MNU:IDR_TRAY]
|
||||
Type=1
|
||||
Class=CIcecast2winDlg
|
||||
Command1=ID_BLANK_RESTORE
|
||||
CommandCount=1
|
||||
|
||||
[MNU:IDR_MENU4]
|
||||
Type=1
|
||||
Class=CIcecast2winDlg
|
||||
Command1=ID_FILE_EXIT
|
||||
Command2=ID_FILE_EDITCONFIGURATION
|
||||
Command3=ID_ABOUT_HELP
|
||||
Command4=ID_ABOUT_CREDITS
|
||||
CommandCount=4
|
||||
|
||||
|
@ -110,14 +110,6 @@ 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
|
||||
|
@ -1,301 +1,299 @@
|
||||
//Microsoft Developer Studio generated resource script.
|
||||
//
|
||||
#include "resource.h"
|
||||
|
||||
#define APSTUDIO_READONLY_SYMBOLS
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Generated from the TEXTINCLUDE 2 resource.
|
||||
//
|
||||
#include "afxres.h"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#undef APSTUDIO_READONLY_SYMBOLS
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// English (U.S.) resources
|
||||
|
||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
||||
#ifdef _WIN32
|
||||
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||
#pragma code_page(1252)
|
||||
#endif //_WIN32
|
||||
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// TEXTINCLUDE
|
||||
//
|
||||
|
||||
1 TEXTINCLUDE DISCARDABLE
|
||||
BEGIN
|
||||
"resource.h\0"
|
||||
END
|
||||
|
||||
2 TEXTINCLUDE DISCARDABLE
|
||||
BEGIN
|
||||
"#include ""afxres.h""\r\n"
|
||||
"\0"
|
||||
END
|
||||
|
||||
3 TEXTINCLUDE DISCARDABLE
|
||||
BEGIN
|
||||
"#define _AFX_NO_SPLITTER_RESOURCES\r\n"
|
||||
"#define _AFX_NO_OLE_RESOURCES\r\n"
|
||||
"#define _AFX_NO_TRACKER_RESOURCES\r\n"
|
||||
"#define _AFX_NO_PROPERTY_RESOURCES\r\n"
|
||||
"\r\n"
|
||||
"#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
|
||||
"#ifdef _WIN32\r\n"
|
||||
"LANGUAGE 9, 1\r\n"
|
||||
"#pragma code_page(1252)\r\n"
|
||||
"#endif //_WIN32\r\n"
|
||||
"#include ""res\\Icecast2win.rc2"" // non-Microsoft Visual C++ edited resources\r\n"
|
||||
"#include ""afxres.rc"" // Standard components\r\n"
|
||||
"#endif\r\n"
|
||||
"\0"
|
||||
END
|
||||
|
||||
#endif // APSTUDIO_INVOKED
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Dialog
|
||||
//
|
||||
|
||||
IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 235, 55
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "About Icecast2win"
|
||||
FONT 8, "MS Sans Serif"
|
||||
BEGIN
|
||||
ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20
|
||||
LTEXT "Icecast 2 Win32",IDC_STATIC,40,10,119,8,SS_NOPREFIX
|
||||
DEFPUSHBUTTON "OK",IDOK,178,7,50,14,WS_GROUP
|
||||
END
|
||||
|
||||
IDD_ICECAST2WIN_DIALOG DIALOGEX 0, 0, 318, 249
|
||||
STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
|
||||
WS_SYSMENU | WS_THICKFRAME
|
||||
EXSTYLE WS_EX_APPWINDOW
|
||||
CAPTION "icecast2"
|
||||
MENU IDR_MENU4
|
||||
FONT 8, "MS Sans Serif"
|
||||
BEGIN
|
||||
CONTROL "Tab1",IDC_MAINTAB,"SysTabControl32",0x0,0,48,318,201
|
||||
PUSHBUTTON "Start Server",IDC_START,17,31,56,14
|
||||
CONTROL "Start Server on Application Startup",IDC_AUTOSTART,
|
||||
"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,76,
|
||||
29,81,17
|
||||
CONTROL 159,IDC_STATIC,"Static",SS_BITMAP,0,0,117,20
|
||||
CONTROL 151,IDC_SERVERSTATUS,"Static",SS_BITMAP,173,32,65,18,
|
||||
WS_EX_CLIENTEDGE
|
||||
CTEXT "Server Status",IDC_STATIC_SS,172,23,65,10,
|
||||
SS_CENTERIMAGE
|
||||
CONTROL 150,IDC_STATICBLACK,"Static",SS_BITMAP,116,0,200,20
|
||||
PUSHBUTTON "Hide To Systray",IDC_HIDESYSTRAY,257,22,58,12
|
||||
END
|
||||
|
||||
IDD_SSTATUS DIALOG DISCARDABLE 0, 0, 320, 210
|
||||
STYLE WS_CHILD
|
||||
FONT 8, "MS Sans Serif"
|
||||
BEGIN
|
||||
LTEXT "",IDC_FILLER2,0,199,319,11
|
||||
CONTROL "List1",IDC_GLOBALSTAT_LIST,"SysListView32",LVS_REPORT |
|
||||
WS_BORDER | WS_TABSTOP,9,34,300,147
|
||||
CTEXT "Global Statistics",IDC_STATIC_GS,9,6,300,10
|
||||
LTEXT "Server Has Been Running For ",IDC_STATIC_RUN,46,184,100,
|
||||
8
|
||||
LTEXT "",IDC_RUNNINGFOR,149,184,156,8
|
||||
END
|
||||
|
||||
IDD_CONFIGDIALOG DIALOG DISCARDABLE 0, 0, 320, 210
|
||||
STYLE WS_CHILD
|
||||
FONT 8, "MS Sans Serif"
|
||||
BEGIN
|
||||
EDITTEXT IDC_CONFIG,0,0,320,210,ES_MULTILINE | ES_AUTOVSCROLL |
|
||||
ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL
|
||||
END
|
||||
|
||||
IDD_STATSDIALOG DIALOG DISCARDABLE 0, 0, 320, 210
|
||||
STYLE WS_CHILD
|
||||
FONT 8, "MS Sans Serif"
|
||||
BEGIN
|
||||
CONTROL "List1",IDC_STATSLIST,"SysListView32",LVS_REPORT |
|
||||
WS_BORDER | WS_TABSTOP,142,34,149,160
|
||||
CONTROL "List2",IDC_SOURCELIST,"SysListView32",LVS_REPORT |
|
||||
WS_BORDER | WS_TABSTOP,9,34,111,159
|
||||
LTEXT "",IDC_FILLER1,0,199,320,11
|
||||
CTEXT "Source Level Statistics",IDC_STATIC_SLS,9,7,300,10
|
||||
LTEXT "Click source to view statistics",IDC_STATIC,18,25,111,8
|
||||
END
|
||||
|
||||
|
||||
#ifndef _MAC
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Version
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 1,0,0,1
|
||||
PRODUCTVERSION 1,0,0,1
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
#else
|
||||
FILEFLAGS 0x0L
|
||||
#endif
|
||||
FILEOS 0x4L
|
||||
FILETYPE 0x1L
|
||||
FILESUBTYPE 0x0L
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904B0"
|
||||
BEGIN
|
||||
VALUE "CompanyName", "\0"
|
||||
VALUE "FileDescription", "Icecast2win MFC Application\0"
|
||||
VALUE "FileVersion", "1, 0, 0, 1\0"
|
||||
VALUE "InternalName", "Icecast2win\0"
|
||||
VALUE "LegalCopyright", "Copyright (C) 2001\0"
|
||||
VALUE "LegalTrademarks", "\0"
|
||||
VALUE "OriginalFilename", "Icecast2win.EXE\0"
|
||||
VALUE "ProductName", "Icecast2win Application\0"
|
||||
VALUE "ProductVersion", "1, 0, 0, 1\0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 1200
|
||||
END
|
||||
END
|
||||
|
||||
#endif // !_MAC
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// DESIGNINFO
|
||||
//
|
||||
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
GUIDELINES DESIGNINFO DISCARDABLE
|
||||
BEGIN
|
||||
IDD_ABOUTBOX, DIALOG
|
||||
BEGIN
|
||||
LEFTMARGIN, 7
|
||||
RIGHTMARGIN, 228
|
||||
TOPMARGIN, 7
|
||||
BOTTOMMARGIN, 48
|
||||
END
|
||||
END
|
||||
#endif // APSTUDIO_INVOKED
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Bitmap
|
||||
//
|
||||
|
||||
IDB_BITMAP4 BITMAP DISCARDABLE "black.bmp"
|
||||
IDB_BITMAP5 BITMAP DISCARDABLE "stopped.bmp"
|
||||
IDB_BITMAP6 BITMAP DISCARDABLE "running.bmp"
|
||||
IDB_BITMAP7 BITMAP DISCARDABLE "icecast2logo2.bmp"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Icon
|
||||
//
|
||||
|
||||
// Icon with lowest ID value placed first to ensure application icon
|
||||
// remains consistent on all systems.
|
||||
IDR_MAINFRAME ICON DISCARDABLE "icecast.ico"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Menu
|
||||
//
|
||||
|
||||
IDR_MENU2 MENU DISCARDABLE
|
||||
BEGIN
|
||||
POPUP "Popup"
|
||||
BEGIN
|
||||
MENUITEM "Add To Global Stat List", ID_POPUP_ADDTOGLOBALSTATLIST
|
||||
END
|
||||
END
|
||||
|
||||
IDR_MENU3 MENU DISCARDABLE
|
||||
BEGIN
|
||||
POPUP " "
|
||||
BEGIN
|
||||
MENUITEM "Delete From Global Stats", ID__DELETEFROMGLOBALSTATS
|
||||
MENUITEM "Make this stat the window title",
|
||||
ID__MAKETHISSTATTHEWINDOWTITLE
|
||||
|
||||
END
|
||||
END
|
||||
|
||||
IDR_TRAY MENU DISCARDABLE
|
||||
BEGIN
|
||||
POPUP "Blank"
|
||||
BEGIN
|
||||
MENUITEM "Restore", ID_BLANK_RESTORE
|
||||
END
|
||||
END
|
||||
|
||||
IDR_MENU4 MENU DISCARDABLE
|
||||
BEGIN
|
||||
POPUP "&File"
|
||||
BEGIN
|
||||
MENUITEM "E&xit", ID_FILE_EXIT
|
||||
END
|
||||
POPUP "C&onfiguration"
|
||||
BEGIN
|
||||
MENUITEM "&Edit Configuration", ID_FILE_EDITCONFIGURATION
|
||||
END
|
||||
POPUP "&About"
|
||||
BEGIN
|
||||
MENUITEM "H&elp", ID_ABOUT_HELP
|
||||
MENUITEM "Cr&edits", ID_ABOUT_CREDITS
|
||||
END
|
||||
END
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// String Table
|
||||
//
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_ABOUTBOX "&About Icecast2win..."
|
||||
END
|
||||
|
||||
#endif // English (U.S.) resources
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
|
||||
#ifndef APSTUDIO_INVOKED
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Generated from the TEXTINCLUDE 3 resource.
|
||||
//
|
||||
#define _AFX_NO_SPLITTER_RESOURCES
|
||||
#define _AFX_NO_OLE_RESOURCES
|
||||
#define _AFX_NO_TRACKER_RESOURCES
|
||||
#define _AFX_NO_PROPERTY_RESOURCES
|
||||
|
||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
||||
#ifdef _WIN32
|
||||
LANGUAGE 9, 1
|
||||
#pragma code_page(1252)
|
||||
#endif //_WIN32
|
||||
#include "res\Icecast2win.rc2" // non-Microsoft Visual C++ edited resources
|
||||
#include "afxres.rc" // Standard components
|
||||
#endif
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#endif // not APSTUDIO_INVOKED
|
||||
|
||||
//Microsoft Developer Studio generated resource script.
|
||||
//
|
||||
#include "resource.h"
|
||||
|
||||
#define APSTUDIO_READONLY_SYMBOLS
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Generated from the TEXTINCLUDE 2 resource.
|
||||
//
|
||||
#include "afxres.h"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#undef APSTUDIO_READONLY_SYMBOLS
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// English (U.S.) resources
|
||||
|
||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
||||
#ifdef _WIN32
|
||||
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||
#pragma code_page(1252)
|
||||
#endif //_WIN32
|
||||
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// TEXTINCLUDE
|
||||
//
|
||||
|
||||
1 TEXTINCLUDE DISCARDABLE
|
||||
BEGIN
|
||||
"resource.h\0"
|
||||
END
|
||||
|
||||
2 TEXTINCLUDE DISCARDABLE
|
||||
BEGIN
|
||||
"#include ""afxres.h""\r\n"
|
||||
"\0"
|
||||
END
|
||||
|
||||
3 TEXTINCLUDE DISCARDABLE
|
||||
BEGIN
|
||||
"#define _AFX_NO_SPLITTER_RESOURCES\r\n"
|
||||
"#define _AFX_NO_OLE_RESOURCES\r\n"
|
||||
"#define _AFX_NO_TRACKER_RESOURCES\r\n"
|
||||
"#define _AFX_NO_PROPERTY_RESOURCES\r\n"
|
||||
"\r\n"
|
||||
"#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
|
||||
"#ifdef _WIN32\r\n"
|
||||
"LANGUAGE 9, 1\r\n"
|
||||
"#pragma code_page(1252)\r\n"
|
||||
"#endif //_WIN32\r\n"
|
||||
"#include ""res\\Icecast2win.rc2"" // non-Microsoft Visual C++ edited resources\r\n"
|
||||
"#include ""afxres.rc"" // Standard components\r\n"
|
||||
"#endif\r\n"
|
||||
"\0"
|
||||
END
|
||||
|
||||
#endif // APSTUDIO_INVOKED
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Dialog
|
||||
//
|
||||
|
||||
IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 235, 55
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "About Icecast2win"
|
||||
FONT 8, "MS Sans Serif"
|
||||
BEGIN
|
||||
ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20
|
||||
LTEXT "Icecast 2 Win32",IDC_STATIC,40,10,119,8,SS_NOPREFIX
|
||||
DEFPUSHBUTTON "OK",IDOK,178,7,50,14,WS_GROUP
|
||||
END
|
||||
|
||||
IDD_ICECAST2WIN_DIALOG DIALOGEX 0, 0, 326, 259
|
||||
STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
|
||||
WS_SYSMENU | WS_THICKFRAME
|
||||
EXSTYLE WS_EX_APPWINDOW
|
||||
MENU IDR_MENU4
|
||||
FONT 8, "MS Sans Serif"
|
||||
BEGIN
|
||||
CONTROL "Tab1",IDC_MAINTAB,"SysTabControl32",0x0,0,49,326,210
|
||||
PUSHBUTTON "Start Server",IDC_START,17,31,56,14
|
||||
CONTROL "Start Server on Application Startup",IDC_AUTOSTART,
|
||||
"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,76,
|
||||
29,81,17
|
||||
CONTROL 159,IDC_STATIC,"Static",SS_BITMAP,0,0,117,20
|
||||
CONTROL 151,IDC_SERVERSTATUS,"Static",SS_BITMAP,173,32,65,18,
|
||||
WS_EX_CLIENTEDGE
|
||||
CTEXT "Server Status",IDC_STATIC_SS,172,23,65,10,
|
||||
SS_CENTERIMAGE
|
||||
CONTROL 150,IDC_STATICBLACK,"Static",SS_BITMAP,116,0,214,20
|
||||
PUSHBUTTON "Hide To Systray",IDC_HIDESYSTRAY,262,22,58,12
|
||||
END
|
||||
|
||||
IDD_SSTATUS DIALOG DISCARDABLE 0, 0, 320, 210
|
||||
STYLE WS_CHILD
|
||||
FONT 8, "MS Sans Serif"
|
||||
BEGIN
|
||||
LTEXT "",IDC_FILLER2,0,199,319,11
|
||||
CONTROL "List1",IDC_GLOBALSTAT_LIST,"SysListView32",LVS_REPORT |
|
||||
WS_BORDER | WS_TABSTOP,9,34,300,147
|
||||
LTEXT "Global Statistics",IDC_STATIC_GS,9,6,300,10
|
||||
LTEXT "Server Has Been Running For ",IDC_STATIC_RUN,10,19,109,
|
||||
8
|
||||
LTEXT "",IDC_RUNNINGFOR,121,19,156,8
|
||||
END
|
||||
|
||||
IDD_CONFIGDIALOG DIALOG DISCARDABLE 0, 0, 320, 210
|
||||
STYLE WS_CHILD
|
||||
FONT 8, "MS Sans Serif"
|
||||
BEGIN
|
||||
EDITTEXT IDC_CONFIG,0,0,320,210,ES_MULTILINE | ES_AUTOVSCROLL |
|
||||
ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL
|
||||
END
|
||||
|
||||
IDD_STATSDIALOG DIALOG DISCARDABLE 0, 0, 320, 210
|
||||
STYLE WS_CHILD
|
||||
FONT 8, "MS Sans Serif"
|
||||
BEGIN
|
||||
CONTROL "List1",IDC_STATSLIST,"SysListView32",LVS_REPORT |
|
||||
WS_BORDER | WS_TABSTOP,142,34,163,147
|
||||
CONTROL "List2",IDC_SOURCELIST,"SysListView32",LVS_REPORT |
|
||||
WS_BORDER | WS_TABSTOP,9,34,111,147
|
||||
LTEXT "Source Level Statistics",IDC_STATIC_SLS,9,7,300,10
|
||||
LTEXT "Click source to view statistics",IDC_STATIC,18,25,111,8
|
||||
END
|
||||
|
||||
|
||||
#ifndef _MAC
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Version
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 1,0,0,1
|
||||
PRODUCTVERSION 1,0,0,1
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
#else
|
||||
FILEFLAGS 0x0L
|
||||
#endif
|
||||
FILEOS 0x4L
|
||||
FILETYPE 0x1L
|
||||
FILESUBTYPE 0x0L
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904B0"
|
||||
BEGIN
|
||||
VALUE "CompanyName", "\0"
|
||||
VALUE "FileDescription", "Icecast2win MFC Application\0"
|
||||
VALUE "FileVersion", "1, 0, 0, 1\0"
|
||||
VALUE "InternalName", "Icecast2win\0"
|
||||
VALUE "LegalCopyright", "Copyright (C) 2001\0"
|
||||
VALUE "LegalTrademarks", "\0"
|
||||
VALUE "OriginalFilename", "Icecast2win.EXE\0"
|
||||
VALUE "ProductName", "Icecast2win Application\0"
|
||||
VALUE "ProductVersion", "1, 0, 0, 1\0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 1200
|
||||
END
|
||||
END
|
||||
|
||||
#endif // !_MAC
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// DESIGNINFO
|
||||
//
|
||||
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
GUIDELINES DESIGNINFO DISCARDABLE
|
||||
BEGIN
|
||||
IDD_ABOUTBOX, DIALOG
|
||||
BEGIN
|
||||
LEFTMARGIN, 7
|
||||
RIGHTMARGIN, 228
|
||||
TOPMARGIN, 7
|
||||
BOTTOMMARGIN, 48
|
||||
END
|
||||
END
|
||||
#endif // APSTUDIO_INVOKED
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Bitmap
|
||||
//
|
||||
|
||||
IDB_BITMAP4 BITMAP DISCARDABLE "black.bmp"
|
||||
IDB_BITMAP5 BITMAP DISCARDABLE "stopped.bmp"
|
||||
IDB_BITMAP6 BITMAP DISCARDABLE "running.bmp"
|
||||
IDB_BITMAP7 BITMAP DISCARDABLE "icecast2logo2.bmp"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Icon
|
||||
//
|
||||
|
||||
// Icon with lowest ID value placed first to ensure application icon
|
||||
// remains consistent on all systems.
|
||||
IDR_MAINFRAME ICON DISCARDABLE "icecast.ico"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Menu
|
||||
//
|
||||
|
||||
IDR_MENU2 MENU DISCARDABLE
|
||||
BEGIN
|
||||
POPUP "Popup"
|
||||
BEGIN
|
||||
MENUITEM "Add To Global Stat List", ID_POPUP_ADDTOGLOBALSTATLIST
|
||||
END
|
||||
END
|
||||
|
||||
IDR_MENU3 MENU DISCARDABLE
|
||||
BEGIN
|
||||
POPUP " "
|
||||
BEGIN
|
||||
MENUITEM "Delete From Global Stats", ID__DELETEFROMGLOBALSTATS
|
||||
MENUITEM "Make this stat the window title",
|
||||
ID__MAKETHISSTATTHEWINDOWTITLE
|
||||
|
||||
END
|
||||
END
|
||||
|
||||
IDR_TRAY MENU DISCARDABLE
|
||||
BEGIN
|
||||
POPUP "Blank"
|
||||
BEGIN
|
||||
MENUITEM "Restore", ID_BLANK_RESTORE
|
||||
END
|
||||
END
|
||||
|
||||
IDR_MENU4 MENU DISCARDABLE
|
||||
BEGIN
|
||||
POPUP "&File"
|
||||
BEGIN
|
||||
MENUITEM "E&xit", ID_FILE_EXIT
|
||||
END
|
||||
POPUP "C&onfiguration"
|
||||
BEGIN
|
||||
MENUITEM "&Edit Configuration", ID_FILE_EDITCONFIGURATION
|
||||
END
|
||||
POPUP "&About"
|
||||
BEGIN
|
||||
MENUITEM "H&elp", ID_ABOUT_HELP
|
||||
MENUITEM "Cr&edits", ID_ABOUT_CREDITS
|
||||
END
|
||||
END
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// String Table
|
||||
//
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_ABOUTBOX "&About Icecast2win..."
|
||||
END
|
||||
|
||||
#endif // English (U.S.) resources
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
|
||||
#ifndef APSTUDIO_INVOKED
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Generated from the TEXTINCLUDE 3 resource.
|
||||
//
|
||||
#define _AFX_NO_SPLITTER_RESOURCES
|
||||
#define _AFX_NO_OLE_RESOURCES
|
||||
#define _AFX_NO_TRACKER_RESOURCES
|
||||
#define _AFX_NO_PROPERTY_RESOURCES
|
||||
|
||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
||||
#ifdef _WIN32
|
||||
LANGUAGE 9, 1
|
||||
#pragma code_page(1252)
|
||||
#endif //_WIN32
|
||||
#include "res\Icecast2win.rc2" // non-Microsoft Visual C++ edited resources
|
||||
#include "afxres.rc" // Standard components
|
||||
#endif
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#endif // not APSTUDIO_INVOKED
|
||||
|
||||
|
@ -5,7 +5,6 @@
|
||||
#include "Icecast2win.h"
|
||||
#include "Icecast2winDlg.h"
|
||||
#include <process.h>
|
||||
#include "ResizableDialog.h"
|
||||
|
||||
#include <libxml/xmlmemory.h>
|
||||
#include <libxml/parser.h>
|
||||
@ -24,8 +23,7 @@ extern "C" {
|
||||
#include "client.h"
|
||||
#include "stats.h"
|
||||
}
|
||||
|
||||
|
||||
|
||||
#include <afxinet.h>
|
||||
|
||||
#ifdef _DEBUG
|
||||
@ -165,7 +163,7 @@ void RemoveFromAdditionalGlobalStats(CString source, CString name) {
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// CAboutDlg dialog used for App About
|
||||
|
||||
class CAboutDlg : public CResizableDialog
|
||||
class CAboutDlg : public CDialog
|
||||
{
|
||||
public:
|
||||
CAboutDlg();
|
||||
@ -188,7 +186,7 @@ protected:
|
||||
DECLARE_MESSAGE_MAP()
|
||||
};
|
||||
|
||||
CAboutDlg::CAboutDlg() : CResizableDialog(CAboutDlg::IDD)
|
||||
CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD)
|
||||
{
|
||||
//{{AFX_DATA_INIT(CAboutDlg)
|
||||
//}}AFX_DATA_INIT
|
||||
@ -196,12 +194,12 @@ CAboutDlg::CAboutDlg() : CResizableDialog(CAboutDlg::IDD)
|
||||
|
||||
void CAboutDlg::DoDataExchange(CDataExchange* pDX)
|
||||
{
|
||||
CResizableDialog::DoDataExchange(pDX);
|
||||
CDialog::DoDataExchange(pDX);
|
||||
//{{AFX_DATA_MAP(CAboutDlg)
|
||||
//}}AFX_DATA_MAP
|
||||
}
|
||||
|
||||
BEGIN_MESSAGE_MAP(CAboutDlg, CResizableDialog)
|
||||
BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
|
||||
//{{AFX_MSG_MAP(CAboutDlg)
|
||||
// No message handlers
|
||||
//}}AFX_MSG_MAP
|
||||
@ -212,7 +210,7 @@ END_MESSAGE_MAP()
|
||||
// CIcecast2winDlg dialog
|
||||
|
||||
CIcecast2winDlg::CIcecast2winDlg(CWnd* pParent /*=NULL*/)
|
||||
: CResizableDialog(CIcecast2winDlg::IDD, pParent)
|
||||
: CDialog(CIcecast2winDlg::IDD, pParent)
|
||||
{
|
||||
//{{AFX_DATA_INIT(CIcecast2winDlg)
|
||||
m_AccessEdit = _T("");
|
||||
@ -231,7 +229,7 @@ CIcecast2winDlg::CIcecast2winDlg(CWnd* pParent /*=NULL*/)
|
||||
|
||||
void CIcecast2winDlg::DoDataExchange(CDataExchange* pDX)
|
||||
{
|
||||
CResizableDialog::DoDataExchange(pDX);
|
||||
CDialog::DoDataExchange(pDX);
|
||||
//{{AFX_DATA_MAP(CIcecast2winDlg)
|
||||
DDX_Control(pDX, IDC_STATIC_SS, m_SS);
|
||||
DDX_Control(pDX, IDC_SERVERSTATUS, m_ServerStatusBitmap);
|
||||
@ -241,7 +239,7 @@ void CIcecast2winDlg::DoDataExchange(CDataExchange* pDX)
|
||||
//}}AFX_DATA_MAP
|
||||
}
|
||||
|
||||
BEGIN_MESSAGE_MAP(CIcecast2winDlg, CResizableDialog)
|
||||
BEGIN_MESSAGE_MAP(CIcecast2winDlg, CDialog)
|
||||
//{{AFX_MSG_MAP(CIcecast2winDlg)
|
||||
ON_WM_SYSCOMMAND()
|
||||
ON_WM_PAINT()
|
||||
@ -267,10 +265,11 @@ END_MESSAGE_MAP()
|
||||
// CIcecast2winDlg message handlers
|
||||
|
||||
#include "colors.h"
|
||||
|
||||
|
||||
BOOL CIcecast2winDlg::OnInitDialog()
|
||||
{
|
||||
CResizableDialog::OnInitDialog();
|
||||
CDialog::OnInitDialog();
|
||||
|
||||
// Add "About..." menu item to system menu.
|
||||
|
||||
@ -290,9 +289,8 @@ BOOL CIcecast2winDlg::OnInitDialog()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
g_mainDialog = this;
|
||||
|
||||
|
||||
// Set the icon for this dialog. The framework does this automatically
|
||||
// when the application's main window is not a dialog
|
||||
SetIcon(m_hIcon, TRUE); // Set big icon
|
||||
@ -327,10 +325,10 @@ BOOL CIcecast2winDlg::OnInitDialog()
|
||||
|
||||
LoadConfig();
|
||||
|
||||
AddAnchor(IDC_MAINTAB, TOP_LEFT, BOTTOM_RIGHT);
|
||||
AddAnchor(IDC_STATICBLACK, TOP_LEFT, TOP_RIGHT);
|
||||
// AddAnchor(IDC_MAINTAB, TOP_LEFT, BOTTOM_RIGHT);
|
||||
// AddAnchor(IDC_STATICBLACK, TOP_LEFT, TOP_RIGHT);
|
||||
|
||||
EnableSaveRestore("icecast2win", "positions");
|
||||
// EnableSaveRestore("icecast2win", "positions");
|
||||
|
||||
m_pTray = NULL;
|
||||
|
||||
@ -354,7 +352,7 @@ void CIcecast2winDlg::OnSysCommand(UINT nID, LPARAM lParam)
|
||||
}
|
||||
else
|
||||
{
|
||||
CResizableDialog::OnSysCommand(nID, lParam);
|
||||
CDialog::OnSysCommand(nID, lParam);
|
||||
}
|
||||
}
|
||||
|
||||
@ -383,7 +381,7 @@ void CIcecast2winDlg::OnPaint()
|
||||
}
|
||||
else
|
||||
{
|
||||
CResizableDialog::OnPaint();
|
||||
CDialog::OnPaint();
|
||||
}
|
||||
}
|
||||
|
||||
@ -636,7 +634,7 @@ void CIcecast2winDlg::OnTimer(UINT nIDEvent)
|
||||
}
|
||||
}
|
||||
|
||||
CResizableDialog::OnTimer(nIDEvent);
|
||||
CDialog::OnTimer(nIDEvent);
|
||||
}
|
||||
|
||||
char g_configFile[1024] = "";
|
||||
@ -984,7 +982,7 @@ void CIcecast2winDlg::config_read()
|
||||
char buf[1024] = "";
|
||||
CString tempString;
|
||||
|
||||
m_colSource0Width = GetPrivateProfileInt(gAppName, "col0SourceWidth", 150, gConfigFile);
|
||||
m_colSource0Width = GetPrivateProfileInt(gAppName, "col0SourceWidth", 163, gConfigFile);
|
||||
m_colStats0Width = GetPrivateProfileInt(gAppName, "col0StatsWidth", 100, gConfigFile);
|
||||
m_colStats1Width = GetPrivateProfileInt(gAppName, "col1StatsWidth", 150, gConfigFile);
|
||||
m_colGStats0Width = GetPrivateProfileInt(gAppName, "col0GStatsWidth", 150, gConfigFile);
|
||||
@ -1038,21 +1036,33 @@ void CIcecast2winDlg::OnClose()
|
||||
{
|
||||
// TODO: Add your message handler code here and/or call default
|
||||
config_write();
|
||||
CResizableDialog::OnClose();
|
||||
CDialog::OnClose();
|
||||
}
|
||||
|
||||
void CIcecast2winDlg::OnSize(UINT nType, int cx, int cy)
|
||||
{
|
||||
CResizableDialog::OnSize(nType, cx, cy);
|
||||
CDialog::OnSize(nType, cx, cy);
|
||||
|
||||
int border1 = 0;
|
||||
int border2 = 78;
|
||||
// TODO: Add your message handler code here
|
||||
if (m_MainTab.m_hWnd) {
|
||||
CRect rect;
|
||||
GetClientRect (&rect);
|
||||
m_MainTab.ResizeDialog(0, rect.Width()-border1, rect.Height()-border2);
|
||||
m_MainTab.ResizeDialog(1, rect.Width()-border1, rect.Height()-border2);
|
||||
GetClientRect (&rect);
|
||||
int x = rect.Width()-border1;
|
||||
int y = rect.Width()-border2;
|
||||
|
||||
statusTab.SetWindowPos(NULL, 4, 22, cx, cy, SWP_NOZORDER);
|
||||
statsTab.SetWindowPos(NULL, 4, 22, cx, cy, SWP_NOZORDER);
|
||||
statusTab.m_GlobalStatList.SetWindowPos(NULL, 14, 55, cx-40, cy-180, SWP_NOZORDER);
|
||||
statsTab.m_StatsListCtrl.SetWindowPos(NULL, 213, 55, cx-243, cy-180, SWP_NOZORDER);
|
||||
statsTab.m_SourceListCtrl.SetWindowPos(NULL, 14, 55, 166, cy-180, SWP_NOZORDER);
|
||||
// CListCtrl m_StatsListCtrl;
|
||||
// CListCtrl m_SourceListCtrl;
|
||||
m_MainTab.SetWindowPos(NULL, 0, 80, cx, cy, SWP_NOZORDER);
|
||||
|
||||
//m_MainTab.ResizeDialog(0, rect.Width()-border1, rect.Height()-border2);
|
||||
//m_MainTab.ResizeDialog(1, rect.Width()-border1, rect.Height()-border2);
|
||||
}
|
||||
|
||||
}
|
||||
@ -1123,7 +1133,7 @@ void CIcecast2winDlg::OnBlankRestore()
|
||||
|
||||
void CIcecast2winDlg::OnDestroy()
|
||||
{
|
||||
CResizableDialog::OnDestroy();
|
||||
CDialog::OnDestroy();
|
||||
|
||||
if (m_pTray) {
|
||||
delete m_pTray ;
|
||||
|
@ -4,7 +4,6 @@
|
||||
#if !defined(AFX_ICECAST2WINDLG_H__23B4DA8B_C9BC_49C8_A62C_37FC6BC5E54A__INCLUDED_)
|
||||
#define AFX_ICECAST2WINDLG_H__23B4DA8B_C9BC_49C8_A62C_37FC6BC5E54A__INCLUDED_
|
||||
|
||||
#include "ResizableDialog.h"
|
||||
#include "TabCtrlSSL.h"
|
||||
#include "TabPageSSL.h"
|
||||
|
||||
@ -20,7 +19,7 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// CIcecast2winDlg dialog
|
||||
|
||||
class CIcecast2winDlg : public CResizableDialog
|
||||
class CIcecast2winDlg : public CDialog
|
||||
{
|
||||
// Construction
|
||||
public:
|
||||
|
@ -6,8 +6,8 @@ SUBDIRS = res
|
||||
|
||||
EXTRA_DIST = ConfigTab.cpp ConfigTab.h Icecast2win.clw Icecast2win.cpp \
|
||||
Icecast2win.dsp Icecast2win.dsw Icecast2win.h Icecast2win.rc \
|
||||
Icecast2winDlg.cpp Icecast2winDlg.h Makefile.am ResizableDialog.cpp \
|
||||
ResizableDialog.h StatsTab.cpp StatsTab.h Status.cpp Status.h StdAfx.cpp \
|
||||
Icecast2winDlg.cpp Icecast2winDlg.h Makefile.am \
|
||||
StatsTab.cpp StatsTab.h Status.cpp Status.h StdAfx.cpp \
|
||||
StdAfx.h TabCtrlSSL.cpp TabCtrlSSL.h TabPageSSL.cpp TabPageSSL.h black.bmp \
|
||||
colors.h icecast.dsp icecast.ico icecast2.iss icecast2logo2.bmp\
|
||||
resource.h running.bmp stopped.bmp TRAYNOT.h Traynot.cpp \
|
||||
|
@ -61,9 +61,9 @@ BOOL CStatsTab::OnInitDialog()
|
||||
m_StatsListCtrl.InsertColumn(0, _T("Statistic"), LVCFMT_LEFT, m_colStats0Width);
|
||||
m_StatsListCtrl.InsertColumn(1, _T("Value"), LVCFMT_LEFT, m_colStats1Width);
|
||||
|
||||
AddAnchor(IDC_STATSLIST, TOP_LEFT, BOTTOM_RIGHT);
|
||||
AddAnchor(IDC_SOURCELIST, TOP_LEFT, BOTTOM_LEFT);
|
||||
AddAnchor(IDC_FILLER1, BOTTOM_LEFT, BOTTOM_RIGHT);
|
||||
// AddAnchor(IDC_STATSLIST, TOP_LEFT, BOTTOM_RIGHT);
|
||||
// AddAnchor(IDC_SOURCELIST, TOP_LEFT, BOTTOM_LEFT);
|
||||
// AddAnchor(IDC_FILLER1, BOTTOM_LEFT, BOTTOM_RIGHT);
|
||||
|
||||
m_SourceListCtrl.SetSelectionMark(0);
|
||||
m_SLS.SetFont(&(g_mainDialog->labelFont), TRUE);
|
||||
|
@ -65,10 +65,10 @@ BOOL CStatus::OnInitDialog()
|
||||
|
||||
m_GlobalStatList.SetExtendedStyle(LVS_EX_FULLROWSELECT);
|
||||
// TODO: Add extra initialization here
|
||||
AddAnchor(IDC_FILLER2, BOTTOM_LEFT, BOTTOM_RIGHT);
|
||||
AddAnchor(IDC_GLOBALSTAT_LIST, TOP_LEFT, BOTTOM_RIGHT);
|
||||
AddAnchor(IDC_STATIC_RUN, BOTTOM_LEFT, BOTTOM_RIGHT);
|
||||
AddAnchor(IDC_RUNNINGFOR, BOTTOM_LEFT, BOTTOM_RIGHT);
|
||||
// AddAnchor(IDC_FILLER2, BOTTOM_LEFT, BOTTOM_RIGHT);
|
||||
// AddAnchor(IDC_GLOBALSTAT_LIST, TOP_LEFT, BOTTOM_RIGHT);
|
||||
// AddAnchor(IDC_STATIC_RUN, BOTTOM_LEFT, BOTTOM_RIGHT);
|
||||
// AddAnchor(IDC_RUNNINGFOR, BOTTOM_LEFT, BOTTOM_RIGHT);
|
||||
|
||||
m_GS.SetFont(&(g_mainDialog->labelFont), TRUE);
|
||||
|
||||
|
@ -1,6 +1,5 @@
|
||||
#include "stdafx.h"
|
||||
#include "TabPageSSL.h"
|
||||
#include "ResizableDialog.h"
|
||||
|
||||
#ifdef _DEBUG
|
||||
#define new DEBUG_NEW
|
||||
@ -18,7 +17,7 @@ CTabPageSSL::CTabPageSSL () {
|
||||
}
|
||||
|
||||
CTabPageSSL::CTabPageSSL (UINT nIDTemplate, CWnd* pParent /*=NULL*/)
|
||||
: CResizableDialog(nIDTemplate, pParent) {
|
||||
: CDialog(nIDTemplate, pParent) {
|
||||
#ifndef _AFX_NO_OCC_SUPPORT
|
||||
AfxEnableControlContainer ();
|
||||
#endif // !_AFX_NO_OCC_SUPPORT
|
||||
@ -47,7 +46,7 @@ void CTabPageSSL::OnCancel (void) {
|
||||
|
||||
BOOL CTabPageSSL::OnCommand (WPARAM wParam, LPARAM lParam) {
|
||||
// Call base class OnCommand to allow message map processing
|
||||
CResizableDialog::OnCommand (wParam, lParam);
|
||||
CDialog::OnCommand (wParam, lParam);
|
||||
//
|
||||
// Forward WM_COMMAND messages to the dialog's parent.
|
||||
//
|
||||
@ -58,7 +57,7 @@ BOOL CTabPageSSL::OnNotify (WPARAM wParam, LPARAM lParam, LRESULT* pResult) {
|
||||
//
|
||||
// Forward WM_NOTIFY messages to the dialog's parent.
|
||||
//
|
||||
CResizableDialog::OnNotify (wParam, lParam, pResult);
|
||||
CDialog::OnNotify (wParam, lParam, pResult);
|
||||
return GetParent ()->SendMessage (WM_NOTIFY, wParam, lParam);
|
||||
}
|
||||
|
||||
@ -72,5 +71,5 @@ BOOL CTabPageSSL::OnCmdMsg (UINT nID, int nCode, void* pExtra,
|
||||
return GetParent ()->OnCmdMsg (nID, nCode, pExtra, pHandlerInfo);
|
||||
#endif // !_AFX_NO_OCC_SUPPORT
|
||||
|
||||
return CResizableDialog::OnCmdMsg (nID, nCode, pExtra, pHandlerInfo);
|
||||
return CDialog::OnCmdMsg (nID, nCode, pExtra, pHandlerInfo);
|
||||
}
|
||||
|
@ -3,9 +3,8 @@
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// CTabPageSSL declaration
|
||||
#include "ResizableDialog.h"
|
||||
|
||||
class CTabPageSSL : public CResizableDialog
|
||||
class CTabPageSSL : public CDialog
|
||||
{
|
||||
public:
|
||||
// Construction
|
||||
|
BIN
win32/black.bmp
BIN
win32/black.bmp
Binary file not shown.
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 151 KiB |
@ -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 "../../curl/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"2.0.0\" /D "HAVE_LOCALTIME_R" /YX /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../curl/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"2.0-KH58\" /D "HAVE_LOCALTIME_R" /D "HAVE_OLD_VSNPRINTF" /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 "../../curl/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"2.0.0\" /FD /D /GZ /c
|
||||
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../curl/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"2.0-KH58\" /D "HAVE_LOCALTIME_R" /D "HAVE_OLD_VSNPRINTF" /FD /D /GZ /c
|
||||
# ADD BASE RSC /l 0x409 /d "_DEBUG"
|
||||
# ADD RSC /l 0x409 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
@ -169,11 +169,11 @@ SOURCE=..\src\format_mp3.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\src\format_ogg.c
|
||||
SOURCE=..\src\format_vorbis.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\src\format_ogg.h
|
||||
SOURCE=..\src\format_vorbis.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
|
@ -2,8 +2,8 @@
|
||||
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
|
||||
|
||||
[Setup]
|
||||
AppName=Icecast2 KH47 Win32
|
||||
AppVerName=Icecast v2.0.0 KH47
|
||||
AppName=Icecast2 KH58 Win32
|
||||
AppVerName=Icecast v2.0.0 KH58
|
||||
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=icecast2_win32_2.0.0_KH47_setup
|
||||
OutputBaseFilename=icecast2_win32_2.0.0_KH58_setup
|
||||
WizardImageFile=icecast2logo2.bmp
|
||||
; uncomment the following line if you want your installation to run on NT 3.51 too.
|
||||
; MinVersion=4,3.51
|
||||
|
Loading…
Reference in New Issue
Block a user