OSDN Git Service

感謝祭機能を削除 IM0026-2
authoreru <eru01@users.sourceforge.jp>
Sat, 29 Dec 2007 13:00:38 +0000 (13:00 +0000)
committereru <eru01@users.sourceforge.jp>
Sat, 29 Dec 2007 13:00:38 +0000 (13:00 +0000)
bump時に一瞬GUIの表示がERRORになるのを修正。
GUIで下流情報がバグるのを修正。
感謝祭機能を削除。

PeerCast.root/PeerCast/core/common/version2.h
PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp
PeerCast.root/PeerCast/ui/win32/simple/gui.cpp
PeerCast.root/PeerCast/ui/win32/simple/gui.h
c:/Git/PeerCast.root/PeerCast/core/common/version2.h
c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp
c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp
c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.h

index 28dd346..780b111 100644 (file)
@@ -43,8 +43,8 @@ static const char *PCX_VERSTRING      = "v0.1218(VP0026)";
 #define VERSION_EX 1
 static const char *PCP_CLIENT_VERSION_EX_PREFIX = "IM"; // 2bytes only
 static const int  PCP_CLIENT_VERSION_EX_NUMBER = 26;
-static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0026-patch071223)";
-static const char *PCX_VERSTRING_EX = "v0.1218(IM0026)";
+static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0026-2)";
+static const char *PCX_VERSTRING_EX = "v0.1218(IM0026-2)";
 #endif
 
 // ------------------------------------------------
index a71eed7..d2712fe 100644 (file)
@@ -151,7 +151,6 @@ HINSTANCE hInst;                                                            // current instance
 TCHAR szTitle[MAX_LOADSTRING];                                                         // The title bar text
 TCHAR szWindowClass[MAX_LOADSTRING];                                                           // The title bar text
 TCHAR szWindowClass2[MAX_LOADSTRING];                                                          // The title bar text
-TCHAR szWindowClass3[MAX_LOADSTRING];                                                          // The title bar text
 
 // Foward declarations of functions included in this code module:
 ATOM                           MyRegisterClass(HINSTANCE hInstance);
@@ -168,10 +167,6 @@ void flipNotifyPopup(int id, ServMgr::NOTIFY_TYPE nt);
 
 HWND chWnd=NULL;
 
-bool gbGetFile = FALSE;
-bool gbStart = FALSE;
-time_t gtGetFile;
-time_t gtStartTime;
 // --------------------------------------------------
 void LOG2(const char *fmt,...)
 {
@@ -287,9 +282,6 @@ int APIENTRY WinMain(HINSTANCE hInstance,
        strcpy(szTitle,"PeerCast");
        strcpy(szWindowClass,"PeerCast");
        strcpy(szWindowClass2,"Main");
-       strcpy(szWindowClass3,"Start");
-
-       
 
        if (!allowMulti)
        {
@@ -328,7 +320,6 @@ int APIENTRY WinMain(HINSTANCE hInstance,
        
        MyRegisterClass(hInstance);
        MyRegisterClass2(hInstance);
-       MyRegisterClass3(hInstance);
 
        // Perform application initialization:
        if (!InitInstance (hInstance, nCmdShow)) 
@@ -364,24 +355,6 @@ int APIENTRY WinMain(HINSTANCE hInstance,
                chanMgr->findAndPlayChannel(info,false);
        }
 
-       struct tm t;
-       memset(&t,0,sizeof(t));
-       t.tm_year = 2007 - 1900;
-       t.tm_mon = 4 - 1;
-       t.tm_mday = 7;
-       t.tm_hour = 21;
-       t.tm_min = 0;
-       t.tm_sec = 0;
-       gtStartTime = ::mktime(&t);
-       t.tm_hour = 20;
-       t.tm_min = 50;
-       gtGetFile = ::mktime(&t);
-
-       if (gtStartTime > sys->getTime()){
-               gbGetFile = TRUE;
-               gbStart = TRUE;
-       }
-
        hAccelTable = LoadAccelerators(hInstance, (LPCTSTR)IDC_SIMPLE);
 
        // setup menu notifes
@@ -477,28 +450,6 @@ ATOM MyRegisterClass2(HINSTANCE hInstance)
        return RegisterClassEx(&wcex);
 }
 
-ATOM MyRegisterClass3(HINSTANCE hInstance)
-{
-       WNDCLASSEX wcex;
-       
-       wcex.cbSize = sizeof(WNDCLASSEX); 
-
-       wcex.style                      = CS_HREDRAW | CS_VREDRAW;
-       wcex.lpfnWndProc        = (WNDPROC)StartProc;
-       wcex.cbClsExtra         = 0;
-       wcex.cbWndExtra         = 0;
-       wcex.hInstance          = hInstance;
-       wcex.hIcon                      = LoadIcon(hInstance, (LPCTSTR)IDI_SIMPLE);
-       wcex.hCursor            = LoadCursor(NULL, IDC_ARROW);
-       wcex.hbrBackground      = (HBRUSH)(COLOR_WINDOW+1);
-//     wcex.lpszMenuName       = (LPCSTR)IDC_SIMPLE;
-       wcex.lpszMenuName       = NULL;
-       wcex.lpszClassName      = szWindowClass3;
-       wcex.hIconSm            = LoadIcon(wcex.hInstance, (LPCTSTR)IDI_SMALL);
-
-       return RegisterClassEx(&wcex);
-}
-
 //-----------------------------
 void loadIcons(HINSTANCE hInstance, HWND hWnd)
 {
index 82e6e0f..7328cef 100644 (file)
@@ -105,21 +105,9 @@ WLock ChannelDataLock;
 WLock MakeBackLock;
 ChannelData *channelDataTop = NULL;
 
-extern bool gbGetFile;
-extern bool gbStart;
-extern time_t gtGetFile;
-extern time_t gtStartTime;
-ThreadInfo gtiStart;
-ThreadInfo gtiGetFile;
-static char *data1URL = "http://www.idolmaster.jp/download/images/wallpaper/imas360p_800.jpg";
-static char *data2URL = "http://www.xbox.com/NR/rdonlyres/CAB05E2F-3051-409B-A4C8-830167C1C138/0/wpr0701idolmasterw120001.jpg";
-HWND ghStart;
-
 bool gbDispTop = false;
 bool gbAllOpen = false;
 
-THREAD_PROC FestivalStart(ThreadInfo *thread);
-
 THREAD_PROC GetHostName(ThreadInfo *thread){
        IdData *id = (IdData*)(thread->data);
 
@@ -153,69 +141,6 @@ THREAD_PROC GetHostName(ThreadInfo *thread){
        return 0;
 }
 
-bool DownloadFile(LPCTSTR URL, LPCTSTR local){
-       char header[] = "Accept: */*\r\n\r\n";
-       char buf[4096];
-
-       FileStream f;
-       HINTERNET hInternet;
-       HINTERNET hConnect;
-
-       try{
-               f.openWriteReplace(local);
-       }catch(StreamException &e){
-               return false;
-       }
-
-       hInternet = ::InternetOpen(NULL, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0);
-       if (hInternet == NULL){
-               return false;
-       }
-
-       hConnect = ::InternetOpenUrl(hInternet, URL, header, strlen(header), INTERNET_FLAG_DONT_CACHE, 0);
-       if (hConnect == NULL){
-               ::InternetCloseHandle(hInternet);
-               return false;
-       }
-
-       while(1){
-               sys->sleep(0);
-               DWORD dwReadSize;
-               BOOL ret = ::InternetReadFile(hConnect, buf, 4096, &dwReadSize);
-               if (ret){
-                       if (dwReadSize == 0){
-                               break;
-                       }
-                       try{
-                               f.write(buf, dwReadSize);
-                               continue;
-                       } catch(StreamException e){
-                       }
-                       f.close();
-                       ::InternetCloseHandle(hConnect);
-                       ::InternetCloseHandle(hInternet);
-                       return false;
-               }
-       }
-
-       f.flush();
-       f.close();
-       ::InternetCloseHandle(hConnect);
-       ::InternetCloseHandle(hInternet);
-
-       return true;
-}
-
-THREAD_PROC GetInternetFile(ThreadInfo *thread){
-
-       DownloadFile(data1URL, "data1.jpg");
-       DownloadFile(data2URL, "data2.jpg");
-       return 0;
-}
-
-extern TCHAR szWindowClass3[];                                                         // The title bar text
-
-
 int drawSpeed(Graphics *gra, int posX, int posY){
 
        // \91¬\93x\95\\8e¦\95\94\82Ì\94w\8ci\82ð\94\92\82­\82·\82é
@@ -339,7 +264,7 @@ int ChannelData::drawChannel(Graphics *g, int x, int y){
        posX = x;
        posY = y;
 
-       int w,h;
+       int w/*,h*/;
 
        if (getWidth() == 0){
                if (gW){
@@ -666,7 +591,7 @@ void ServentData::setData(Servent *s, ChanHit *hit, unsigned int listeners, unsi
 int ServentData::drawServent(Gdiplus::Graphics *g, int x, int y){
        REAL xx = x * 1.0f;
        REAL yy = y * 1.0f;
-       int w,h;
+       int w/*,h*/;
 
        // \88Ê\92u\82ð\95Û\91
        posX = x;
@@ -1039,20 +964,6 @@ THREAD_PROC GUIDataUpdate(ThreadInfo *thread){
                                break;
                        sys->sleep(100);
                }
-
-               if (gbGetFile && (sys->getTime() > gtGetFile)){
-                       gbGetFile = false;
-                       gtiGetFile.func = GetInternetFile;
-                       gtiGetFile.data = NULL;
-                       sys->startThread(&gtiGetFile);
-               }
-               else if (gbStart && (sys->getTime() > gtStartTime)){
-                       gbStart = false;
-                       SendMessage(guiWnd, WM_START, 0, 0);
-                       gtiStart.func = FestivalStart;
-                       gtiStart.data = NULL;
-                       sys->startThread(&gtiStart);
-               }
        }
 
        // set GUI thread status to terminated
@@ -1681,20 +1592,6 @@ LRESULT CALLBACK GUIProc (HWND hwnd, UINT message,
 
                        guiWnd = NULL;
                        break;
-               case WM_START:
-                       ghStart = ::CreateWindow(szWindowClass3,
-                               "Peercast-IM@S",
-                               WS_OVERLAPPEDWINDOW & ~(WS_MAXIMIZEBOX),
-                               0,
-                               0,
-                               400,
-                               300,
-                               NULL,
-                               NULL,
-                               hInst,
-                               NULL);
-                       ::ShowWindow(ghStart, SW_SHOWNORMAL);
-                       break;
 
                default:
                        return (DefWindowProc(hwnd, message, wParam, lParam));
@@ -1702,193 +1599,3 @@ LRESULT CALLBACK GUIProc (HWND hwnd, UINT message,
 
        return 0;
 }
-
-Gdiplus::Image *data1 = NULL;
-Gdiplus::Image *data2 = NULL;
-Gdiplus::Bitmap *startBmp = NULL;
-Gdiplus::Graphics *startGra = NULL;
-WLock MakeStartLock;
-
-LRESULT CALLBACK StartProc (HWND hwnd, UINT message,
-                                 WPARAM wParam, LPARAM lParam)
-{
-       SolidBrush b(Color::Black);
-       bstr_t bstr;
-
-       switch(message){
-               case WM_CREATE:
-                       startBmp = ::new Bitmap(400,300);
-                       startGra = ::new Graphics(startBmp);
-                       bstr = L"data1.jpg";
-                       data1 = ::new Image(bstr);
-                       bstr = L"data2.jpg";
-                       data2 = ::new Image(bstr);
-                       // \8d\95\82Å\93h\82è\82Â\82Ô\82µ
-                       startGra->FillRectangle(&b, 0, 0, 400, 300);
-                       break;
-               case WM_PAINT:
-                       if (startGra){
-                               HDC hdc;
-                               PAINTSTRUCT paint;
-
-                               MakeStartLock.on();
-                               hdc = BeginPaint(hwnd, &paint);
-                               RECT *rcRect;
-                               rcRect = &(paint.rcPaint);
-                               LONG width = rcRect->right - rcRect->left + 1;
-                               LONG height = rcRect->bottom - rcRect->top + 1;
-
-                               Graphics g2(hdc);
-                               Rect r(rcRect->left, rcRect->top, width, height);
-                               g2.DrawImage(startBmp, r, rcRect->left, rcRect->top, width, height, UnitPixel);
-                               EndPaint(hwnd, &paint);
-                               MakeStartLock.off();
-                       }
-                       break;
-               case WM_ERASEBKGND:
-                       return TRUE;
-               case WM_CLOSE:
-                       DestroyWindow(ghStart);
-                       if (startBmp){
-                               ::delete startBmp;
-                       }
-                       if (startGra){
-                               ::delete startGra;
-                       }
-                       if (data1){
-                               ::delete data1;
-                       }
-                       if (data2){
-                               ::delete data2;
-                       }
-                       break;
-
-               default:
-                       return (DefWindowProc(hwnd, message, wParam, lParam));
-       }
-
-       return 0;
-}
-
-THREAD_PROC FestivalStart(ThreadInfo *thread){
-
-       while(startGra==NULL){
-               sys->sleep(100);
-       }
-
-       sys->sleep(1000);
-
-       MakeStartLock.on();
-       Font font(L"\82l\82\82o\83S\83V\83b\83N",40);
-       StringFormat format;
-       format.SetAlignment(StringAlignmentCenter);
-       startGra->SetTextRenderingHint(TextRenderingHintAntiAlias);
-       PointF origin(199.0f,49.0f);
-       RectF rect(0,0,400,100);
-       LinearGradientBrush b1(rect, Color::LightSkyBlue, Color::White, LinearGradientModeHorizontal);
-       startGra->DrawString(L"\91æ\82Q\89ñ", -1, &font, origin, &format, &b1);
-       origin.Y += 50;
-       LinearGradientBrush b2(rect, Color::LightGreen, Color::White, LinearGradientModeHorizontal);
-       startGra->DrawString(L"\83A\83C\83h\83\8b\83}\83X\83^\81[", -1, &font, origin, &format, &b2);
-       origin.Y += 50;
-       LinearGradientBrush b3(rect, Color::LightGoldenrodYellow, Color::White, LinearGradientModeHorizontal);
-       startGra->DrawString(L"\83t\83@\83\93\8a´\8eÓ\8dÕ", -1, &font, origin, &format, &b3);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(3000);
-
-       MakeStartLock.on();
-       startGra->DrawImage(data1, Rect(0,0,80,400), 200,200,66,330, UnitPixel);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(500);
-
-       MakeStartLock.on();
-       startGra->DrawImage(data1, Rect(80,0,80,400), 266,200,66,330, UnitPixel);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(500);
-
-       MakeStartLock.on();
-       startGra->DrawImage(data1, Rect(160,0,80,400), 332,200,66,330, UnitPixel);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(500);
-
-       MakeStartLock.on();
-       startGra->DrawImage(data1, Rect(240,0,80,400), 398,200,66,330, UnitPixel);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(500);
-
-       MakeStartLock.on();
-       startGra->DrawImage(data1, Rect(320,0,80,400), 464,200,66,330, UnitPixel);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(500);
-
-       MakeStartLock.on();
-       startGra->DrawImage(data1, Rect(0,0,80,400), 530,200,54,270, UnitPixel);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(500);
-
-       MakeStartLock.on();
-       startGra->DrawImage(data1, Rect(80,0,80,400), 584,200,54,270, UnitPixel);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(500);
-
-       MakeStartLock.on();
-       startGra->DrawImage(data1, Rect(160,0,80,400), 638,200,54,270, UnitPixel);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(500);
-
-       MakeStartLock.on();
-       startGra->DrawImage(data1, Rect(240,0,80,400), 692,200,54,270, UnitPixel);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(500);
-
-       MakeStartLock.on();
-       startGra->DrawImage(data1, Rect(320,0,80,400), 746,200,54,270, UnitPixel);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(500);
-
-       for (int i=1; i<=10; i++){
-               ColorMatrix mtx = {
-                       1.0f, 0.0f, 0.0f, 0.0f, 0.0f,
-                       0.0f, 1.0f, 0.0f, 0.0f, 0.0f,
-                       0.0f, 0.0f, 1.0f, 0.0f, 0.0f,
-                       0.0f, 0.0f, 0.0f, 0.1f*i, 0.0f,
-                       0.0f, 0.0f, 0.0f, 0.0f, 1.0f};
-               ImageAttributes att;
-
-               MakeStartLock.on();
-               att.SetColorMatrix(&mtx, ColorMatrixFlagsDefault, ColorAdjustTypeBitmap);
-               startGra->DrawImage(data2, Rect(0,0,400,300), 360,130,400,300, UnitPixel, &att);
-               MakeStartLock.off();
-               InvalidateRect(ghStart, NULL, FALSE);
-               sys->sleep(100);
-       }
-
-       sys->sleep(2000);
-
-       MakeStartLock.on();
-       INT style = FontStyleBold;
-       Font font2(L"\82l\82\82o\83S\83V\83b\83N",70,style,UnitPoint);
-       PointF origin2(199.0f,99.0f);
-       SolidBrush bs(Color::Black);
-       startGra->DrawString(L"START!", -1, &font2, origin2, &format, &bs);
-       Font font3(L"\82l\82\82o\83S\83V\83b\83N",70,style,UnitPoint);
-       LinearGradientBrush bx(rect, Color::LightPink, Color::DeepPink, LinearGradientModeHorizontal);
-       startGra->DrawString(L"START!", -1, &font3, origin2, &format, &bx);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(5000);
-
-       SendMessage(ghStart, WM_CLOSE, 0, 0);
-       return 0;
-}
index 84e7381..239f7d0 100644 (file)
@@ -24,7 +24,6 @@
 #include "channel.h"
 
 extern LRESULT CALLBACK GUIProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
-extern LRESULT CALLBACK StartProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
 extern void ADDLOG(const char *str,int id,bool sel,void *data, LogBuffer::TYPE type);
 
 extern String iniFileName;
@@ -39,9 +38,7 @@ enum
        WM_TRAYICON,
        WM_SHOWGUI,
        WM_SHOWMENU,
-       WM_PROCURL,
-       WM_START
-
+       WM_PROCURL
 };
 
 class IdData
index 28dd346..780b111 100644 (file)
@@ -43,8 +43,8 @@ static const char *PCX_VERSTRING      = "v0.1218(VP0026)";
 #define VERSION_EX 1
 static const char *PCP_CLIENT_VERSION_EX_PREFIX = "IM"; // 2bytes only
 static const int  PCP_CLIENT_VERSION_EX_NUMBER = 26;
-static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0026-patch071223)";
-static const char *PCX_VERSTRING_EX = "v0.1218(IM0026)";
+static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0026-2)";
+static const char *PCX_VERSTRING_EX = "v0.1218(IM0026-2)";
 #endif
 
 // ------------------------------------------------
index a71eed7..d2712fe 100644 (file)
@@ -151,7 +151,6 @@ HINSTANCE hInst;                                                            // current instance
 TCHAR szTitle[MAX_LOADSTRING];                                                         // The title bar text
 TCHAR szWindowClass[MAX_LOADSTRING];                                                           // The title bar text
 TCHAR szWindowClass2[MAX_LOADSTRING];                                                          // The title bar text
-TCHAR szWindowClass3[MAX_LOADSTRING];                                                          // The title bar text
 
 // Foward declarations of functions included in this code module:
 ATOM                           MyRegisterClass(HINSTANCE hInstance);
@@ -168,10 +167,6 @@ void flipNotifyPopup(int id, ServMgr::NOTIFY_TYPE nt);
 
 HWND chWnd=NULL;
 
-bool gbGetFile = FALSE;
-bool gbStart = FALSE;
-time_t gtGetFile;
-time_t gtStartTime;
 // --------------------------------------------------
 void LOG2(const char *fmt,...)
 {
@@ -287,9 +282,6 @@ int APIENTRY WinMain(HINSTANCE hInstance,
        strcpy(szTitle,"PeerCast");
        strcpy(szWindowClass,"PeerCast");
        strcpy(szWindowClass2,"Main");
-       strcpy(szWindowClass3,"Start");
-
-       
 
        if (!allowMulti)
        {
@@ -328,7 +320,6 @@ int APIENTRY WinMain(HINSTANCE hInstance,
        
        MyRegisterClass(hInstance);
        MyRegisterClass2(hInstance);
-       MyRegisterClass3(hInstance);
 
        // Perform application initialization:
        if (!InitInstance (hInstance, nCmdShow)) 
@@ -364,24 +355,6 @@ int APIENTRY WinMain(HINSTANCE hInstance,
                chanMgr->findAndPlayChannel(info,false);
        }
 
-       struct tm t;
-       memset(&t,0,sizeof(t));
-       t.tm_year = 2007 - 1900;
-       t.tm_mon = 4 - 1;
-       t.tm_mday = 7;
-       t.tm_hour = 21;
-       t.tm_min = 0;
-       t.tm_sec = 0;
-       gtStartTime = ::mktime(&t);
-       t.tm_hour = 20;
-       t.tm_min = 50;
-       gtGetFile = ::mktime(&t);
-
-       if (gtStartTime > sys->getTime()){
-               gbGetFile = TRUE;
-               gbStart = TRUE;
-       }
-
        hAccelTable = LoadAccelerators(hInstance, (LPCTSTR)IDC_SIMPLE);
 
        // setup menu notifes
@@ -477,28 +450,6 @@ ATOM MyRegisterClass2(HINSTANCE hInstance)
        return RegisterClassEx(&wcex);
 }
 
-ATOM MyRegisterClass3(HINSTANCE hInstance)
-{
-       WNDCLASSEX wcex;
-       
-       wcex.cbSize = sizeof(WNDCLASSEX); 
-
-       wcex.style                      = CS_HREDRAW | CS_VREDRAW;
-       wcex.lpfnWndProc        = (WNDPROC)StartProc;
-       wcex.cbClsExtra         = 0;
-       wcex.cbWndExtra         = 0;
-       wcex.hInstance          = hInstance;
-       wcex.hIcon                      = LoadIcon(hInstance, (LPCTSTR)IDI_SIMPLE);
-       wcex.hCursor            = LoadCursor(NULL, IDC_ARROW);
-       wcex.hbrBackground      = (HBRUSH)(COLOR_WINDOW+1);
-//     wcex.lpszMenuName       = (LPCSTR)IDC_SIMPLE;
-       wcex.lpszMenuName       = NULL;
-       wcex.lpszClassName      = szWindowClass3;
-       wcex.hIconSm            = LoadIcon(wcex.hInstance, (LPCTSTR)IDI_SMALL);
-
-       return RegisterClassEx(&wcex);
-}
-
 //-----------------------------
 void loadIcons(HINSTANCE hInstance, HWND hWnd)
 {
index 82e6e0f..7328cef 100644 (file)
@@ -105,21 +105,9 @@ WLock ChannelDataLock;
 WLock MakeBackLock;
 ChannelData *channelDataTop = NULL;
 
-extern bool gbGetFile;
-extern bool gbStart;
-extern time_t gtGetFile;
-extern time_t gtStartTime;
-ThreadInfo gtiStart;
-ThreadInfo gtiGetFile;
-static char *data1URL = "http://www.idolmaster.jp/download/images/wallpaper/imas360p_800.jpg";
-static char *data2URL = "http://www.xbox.com/NR/rdonlyres/CAB05E2F-3051-409B-A4C8-830167C1C138/0/wpr0701idolmasterw120001.jpg";
-HWND ghStart;
-
 bool gbDispTop = false;
 bool gbAllOpen = false;
 
-THREAD_PROC FestivalStart(ThreadInfo *thread);
-
 THREAD_PROC GetHostName(ThreadInfo *thread){
        IdData *id = (IdData*)(thread->data);
 
@@ -153,69 +141,6 @@ THREAD_PROC GetHostName(ThreadInfo *thread){
        return 0;
 }
 
-bool DownloadFile(LPCTSTR URL, LPCTSTR local){
-       char header[] = "Accept: */*\r\n\r\n";
-       char buf[4096];
-
-       FileStream f;
-       HINTERNET hInternet;
-       HINTERNET hConnect;
-
-       try{
-               f.openWriteReplace(local);
-       }catch(StreamException &e){
-               return false;
-       }
-
-       hInternet = ::InternetOpen(NULL, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0);
-       if (hInternet == NULL){
-               return false;
-       }
-
-       hConnect = ::InternetOpenUrl(hInternet, URL, header, strlen(header), INTERNET_FLAG_DONT_CACHE, 0);
-       if (hConnect == NULL){
-               ::InternetCloseHandle(hInternet);
-               return false;
-       }
-
-       while(1){
-               sys->sleep(0);
-               DWORD dwReadSize;
-               BOOL ret = ::InternetReadFile(hConnect, buf, 4096, &dwReadSize);
-               if (ret){
-                       if (dwReadSize == 0){
-                               break;
-                       }
-                       try{
-                               f.write(buf, dwReadSize);
-                               continue;
-                       } catch(StreamException e){
-                       }
-                       f.close();
-                       ::InternetCloseHandle(hConnect);
-                       ::InternetCloseHandle(hInternet);
-                       return false;
-               }
-       }
-
-       f.flush();
-       f.close();
-       ::InternetCloseHandle(hConnect);
-       ::InternetCloseHandle(hInternet);
-
-       return true;
-}
-
-THREAD_PROC GetInternetFile(ThreadInfo *thread){
-
-       DownloadFile(data1URL, "data1.jpg");
-       DownloadFile(data2URL, "data2.jpg");
-       return 0;
-}
-
-extern TCHAR szWindowClass3[];                                                         // The title bar text
-
-
 int drawSpeed(Graphics *gra, int posX, int posY){
 
        // \91¬\93x\95\\8e¦\95\94\82Ì\94w\8ci\82ð\94\92\82­\82·\82é
@@ -339,7 +264,7 @@ int ChannelData::drawChannel(Graphics *g, int x, int y){
        posX = x;
        posY = y;
 
-       int w,h;
+       int w/*,h*/;
 
        if (getWidth() == 0){
                if (gW){
@@ -666,7 +591,7 @@ void ServentData::setData(Servent *s, ChanHit *hit, unsigned int listeners, unsi
 int ServentData::drawServent(Gdiplus::Graphics *g, int x, int y){
        REAL xx = x * 1.0f;
        REAL yy = y * 1.0f;
-       int w,h;
+       int w/*,h*/;
 
        // \88Ê\92u\82ð\95Û\91
        posX = x;
@@ -1039,20 +964,6 @@ THREAD_PROC GUIDataUpdate(ThreadInfo *thread){
                                break;
                        sys->sleep(100);
                }
-
-               if (gbGetFile && (sys->getTime() > gtGetFile)){
-                       gbGetFile = false;
-                       gtiGetFile.func = GetInternetFile;
-                       gtiGetFile.data = NULL;
-                       sys->startThread(&gtiGetFile);
-               }
-               else if (gbStart && (sys->getTime() > gtStartTime)){
-                       gbStart = false;
-                       SendMessage(guiWnd, WM_START, 0, 0);
-                       gtiStart.func = FestivalStart;
-                       gtiStart.data = NULL;
-                       sys->startThread(&gtiStart);
-               }
        }
 
        // set GUI thread status to terminated
@@ -1681,20 +1592,6 @@ LRESULT CALLBACK GUIProc (HWND hwnd, UINT message,
 
                        guiWnd = NULL;
                        break;
-               case WM_START:
-                       ghStart = ::CreateWindow(szWindowClass3,
-                               "Peercast-IM@S",
-                               WS_OVERLAPPEDWINDOW & ~(WS_MAXIMIZEBOX),
-                               0,
-                               0,
-                               400,
-                               300,
-                               NULL,
-                               NULL,
-                               hInst,
-                               NULL);
-                       ::ShowWindow(ghStart, SW_SHOWNORMAL);
-                       break;
 
                default:
                        return (DefWindowProc(hwnd, message, wParam, lParam));
@@ -1702,193 +1599,3 @@ LRESULT CALLBACK GUIProc (HWND hwnd, UINT message,
 
        return 0;
 }
-
-Gdiplus::Image *data1 = NULL;
-Gdiplus::Image *data2 = NULL;
-Gdiplus::Bitmap *startBmp = NULL;
-Gdiplus::Graphics *startGra = NULL;
-WLock MakeStartLock;
-
-LRESULT CALLBACK StartProc (HWND hwnd, UINT message,
-                                 WPARAM wParam, LPARAM lParam)
-{
-       SolidBrush b(Color::Black);
-       bstr_t bstr;
-
-       switch(message){
-               case WM_CREATE:
-                       startBmp = ::new Bitmap(400,300);
-                       startGra = ::new Graphics(startBmp);
-                       bstr = L"data1.jpg";
-                       data1 = ::new Image(bstr);
-                       bstr = L"data2.jpg";
-                       data2 = ::new Image(bstr);
-                       // \8d\95\82Å\93h\82è\82Â\82Ô\82µ
-                       startGra->FillRectangle(&b, 0, 0, 400, 300);
-                       break;
-               case WM_PAINT:
-                       if (startGra){
-                               HDC hdc;
-                               PAINTSTRUCT paint;
-
-                               MakeStartLock.on();
-                               hdc = BeginPaint(hwnd, &paint);
-                               RECT *rcRect;
-                               rcRect = &(paint.rcPaint);
-                               LONG width = rcRect->right - rcRect->left + 1;
-                               LONG height = rcRect->bottom - rcRect->top + 1;
-
-                               Graphics g2(hdc);
-                               Rect r(rcRect->left, rcRect->top, width, height);
-                               g2.DrawImage(startBmp, r, rcRect->left, rcRect->top, width, height, UnitPixel);
-                               EndPaint(hwnd, &paint);
-                               MakeStartLock.off();
-                       }
-                       break;
-               case WM_ERASEBKGND:
-                       return TRUE;
-               case WM_CLOSE:
-                       DestroyWindow(ghStart);
-                       if (startBmp){
-                               ::delete startBmp;
-                       }
-                       if (startGra){
-                               ::delete startGra;
-                       }
-                       if (data1){
-                               ::delete data1;
-                       }
-                       if (data2){
-                               ::delete data2;
-                       }
-                       break;
-
-               default:
-                       return (DefWindowProc(hwnd, message, wParam, lParam));
-       }
-
-       return 0;
-}
-
-THREAD_PROC FestivalStart(ThreadInfo *thread){
-
-       while(startGra==NULL){
-               sys->sleep(100);
-       }
-
-       sys->sleep(1000);
-
-       MakeStartLock.on();
-       Font font(L"\82l\82\82o\83S\83V\83b\83N",40);
-       StringFormat format;
-       format.SetAlignment(StringAlignmentCenter);
-       startGra->SetTextRenderingHint(TextRenderingHintAntiAlias);
-       PointF origin(199.0f,49.0f);
-       RectF rect(0,0,400,100);
-       LinearGradientBrush b1(rect, Color::LightSkyBlue, Color::White, LinearGradientModeHorizontal);
-       startGra->DrawString(L"\91æ\82Q\89ñ", -1, &font, origin, &format, &b1);
-       origin.Y += 50;
-       LinearGradientBrush b2(rect, Color::LightGreen, Color::White, LinearGradientModeHorizontal);
-       startGra->DrawString(L"\83A\83C\83h\83\8b\83}\83X\83^\81[", -1, &font, origin, &format, &b2);
-       origin.Y += 50;
-       LinearGradientBrush b3(rect, Color::LightGoldenrodYellow, Color::White, LinearGradientModeHorizontal);
-       startGra->DrawString(L"\83t\83@\83\93\8a´\8eÓ\8dÕ", -1, &font, origin, &format, &b3);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(3000);
-
-       MakeStartLock.on();
-       startGra->DrawImage(data1, Rect(0,0,80,400), 200,200,66,330, UnitPixel);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(500);
-
-       MakeStartLock.on();
-       startGra->DrawImage(data1, Rect(80,0,80,400), 266,200,66,330, UnitPixel);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(500);
-
-       MakeStartLock.on();
-       startGra->DrawImage(data1, Rect(160,0,80,400), 332,200,66,330, UnitPixel);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(500);
-
-       MakeStartLock.on();
-       startGra->DrawImage(data1, Rect(240,0,80,400), 398,200,66,330, UnitPixel);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(500);
-
-       MakeStartLock.on();
-       startGra->DrawImage(data1, Rect(320,0,80,400), 464,200,66,330, UnitPixel);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(500);
-
-       MakeStartLock.on();
-       startGra->DrawImage(data1, Rect(0,0,80,400), 530,200,54,270, UnitPixel);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(500);
-
-       MakeStartLock.on();
-       startGra->DrawImage(data1, Rect(80,0,80,400), 584,200,54,270, UnitPixel);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(500);
-
-       MakeStartLock.on();
-       startGra->DrawImage(data1, Rect(160,0,80,400), 638,200,54,270, UnitPixel);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(500);
-
-       MakeStartLock.on();
-       startGra->DrawImage(data1, Rect(240,0,80,400), 692,200,54,270, UnitPixel);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(500);
-
-       MakeStartLock.on();
-       startGra->DrawImage(data1, Rect(320,0,80,400), 746,200,54,270, UnitPixel);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(500);
-
-       for (int i=1; i<=10; i++){
-               ColorMatrix mtx = {
-                       1.0f, 0.0f, 0.0f, 0.0f, 0.0f,
-                       0.0f, 1.0f, 0.0f, 0.0f, 0.0f,
-                       0.0f, 0.0f, 1.0f, 0.0f, 0.0f,
-                       0.0f, 0.0f, 0.0f, 0.1f*i, 0.0f,
-                       0.0f, 0.0f, 0.0f, 0.0f, 1.0f};
-               ImageAttributes att;
-
-               MakeStartLock.on();
-               att.SetColorMatrix(&mtx, ColorMatrixFlagsDefault, ColorAdjustTypeBitmap);
-               startGra->DrawImage(data2, Rect(0,0,400,300), 360,130,400,300, UnitPixel, &att);
-               MakeStartLock.off();
-               InvalidateRect(ghStart, NULL, FALSE);
-               sys->sleep(100);
-       }
-
-       sys->sleep(2000);
-
-       MakeStartLock.on();
-       INT style = FontStyleBold;
-       Font font2(L"\82l\82\82o\83S\83V\83b\83N",70,style,UnitPoint);
-       PointF origin2(199.0f,99.0f);
-       SolidBrush bs(Color::Black);
-       startGra->DrawString(L"START!", -1, &font2, origin2, &format, &bs);
-       Font font3(L"\82l\82\82o\83S\83V\83b\83N",70,style,UnitPoint);
-       LinearGradientBrush bx(rect, Color::LightPink, Color::DeepPink, LinearGradientModeHorizontal);
-       startGra->DrawString(L"START!", -1, &font3, origin2, &format, &bx);
-       MakeStartLock.off();
-       InvalidateRect(ghStart, NULL, FALSE);
-       sys->sleep(5000);
-
-       SendMessage(ghStart, WM_CLOSE, 0, 0);
-       return 0;
-}
index 84e7381..239f7d0 100644 (file)
@@ -24,7 +24,6 @@
 #include "channel.h"
 
 extern LRESULT CALLBACK GUIProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
-extern LRESULT CALLBACK StartProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
 extern void ADDLOG(const char *str,int id,bool sel,void *data, LogBuffer::TYPE type);
 
 extern String iniFileName;
@@ -39,9 +38,7 @@ enum
        WM_TRAYICON,
        WM_SHOWGUI,
        WM_SHOWMENU,
-       WM_PROCURL,
-       WM_START
-
+       WM_PROCURL
 };
 
 class IdData