From a9b8704866474e41ae581e53c0cff65650c32fba Mon Sep 17 00:00:00 2001 From: yuki Date: Sat, 18 Sep 2010 09:04:10 +0000 Subject: [PATCH] Merging revisions 1-HEAD of http://192.168.11.7/svn/saccubus/branches/20091208_vhook_owner_comment into F:\docs\NetBeansProjects\vhook, respecting ancestry git-svn-id: http://192.168.11.7/svn/saccubus/trunk@419 c066991c-cf13-ec4a-a49a-846e61667af5 --- vhook/chat/chat_slot.c | 2 +- vhook/chat/chat_slot.h | 2 +- vhook/chat/process_chat.c | 4 +- vhook/chat/process_chat.h | 2 +- vhook/comment/com_surface.c | 24 ++--- vhook/comment/com_surface.h | 2 +- vhook/main.c | 42 +++++--- vhook/main.h | 25 +++-- vhook/nbproject/Makefile-Debug.mk | 62 ++++++------ vhook/nbproject/Makefile-Release.mk | 62 ++++++------ vhook/nbproject/Makefile-impl.mk | 2 +- vhook/nbproject/Makefile-variables.mk | 24 +++++ vhook/nbproject/Package-Debug.bash | 18 ++-- vhook/nbproject/Package-Release.bash | 18 ++-- vhook/nbproject/configurations.xml | 178 +++------------------------------- vhook/process.c | 10 +- vhook/struct_define.h | 1 + 17 files changed, 198 insertions(+), 280 deletions(-) create mode 100644 vhook/nbproject/Makefile-variables.mk diff --git a/vhook/chat/chat_slot.c b/vhook/chat/chat_slot.c index a04d902..6e3dd7b 100644 --- a/vhook/chat/chat_slot.c +++ b/vhook/chat/chat_slot.c @@ -53,7 +53,7 @@ void deleteChatSlotFromIndex(CHAT_SLOT* slot,int index){ /* * ƒXƒƒbƒg‚ɒljÁ‚·‚éB */ -void addChatSlot(DATA* data,CHAT_SLOT* slot,CHAT_ITEM* item,int video_width,int video_height){ +void addChatSlot(COMMDATA* data,CHAT_SLOT* slot,CHAT_ITEM* item,int video_width,int video_height){ //‚à‚¤Œ©‚¹‚ç‚ꂽB item->showed = TRUE; if(slot->max_item <= 0){ diff --git a/vhook/chat/chat_slot.h b/vhook/chat/chat_slot.h index 6693bdd..120c6e5 100644 --- a/vhook/chat/chat_slot.h +++ b/vhook/chat/chat_slot.h @@ -26,7 +26,7 @@ struct CHAT_SLOT{ int initChatSlot(FILE* log,CHAT_SLOT* slot,int max_slot,CHAT* chat); void closeChatSlot(CHAT_SLOT* slot); //’ljÁAíœ -void addChatSlot(DATA* data,CHAT_SLOT* slot,CHAT_ITEM* item,int video_width,int video_height); +void addChatSlot(COMMDATA* data,CHAT_SLOT* slot,CHAT_ITEM* item,int video_width,int video_height); void deleteChatSlot(CHAT_SLOT* slot,CHAT_SLOT_ITEM* item); void deleteChatSlotFromIndex(CHAT_SLOT* slot,int index); diff --git a/vhook/chat/process_chat.c b/vhook/chat/process_chat.c index 32fbfe2..db2759c 100644 --- a/vhook/chat/process_chat.c +++ b/vhook/chat/process_chat.c @@ -11,10 +11,10 @@ void drawComment(SDL_Surface* surf,CHAT_SLOT* slot,int now_vpos); /** * ƒRƒƒ“ƒg‚ð•`‰æ‚·‚éB */ -int chat_process(DATA* data,SDL_Surface* surf,const int now_vpos){ +int chat_process(COMMDATA* data,SDL_Surface* surf,const int now_vpos){ CHAT* chat = &data->chat; CHAT_SLOT* slot = &data->slot; - FILE* log = data->log; + FILE* log = data->common->log; /*Œ©‚¹‚È‚¢‚à‚Ì‚ðíœ*/ CHAT_SLOT_ITEM* slot_item; CHAT_ITEM* chat_item; diff --git a/vhook/chat/process_chat.h b/vhook/chat/process_chat.h index dd48e27..469b881 100644 --- a/vhook/chat/process_chat.h +++ b/vhook/chat/process_chat.h @@ -4,7 +4,7 @@ #include "chat.h" #include "chat_slot.h" #include "../main.h" -int chat_process(DATA* data,SDL_Surface* surf,const int now_vpos); +int chat_process(COMMDATA* data,SDL_Surface* surf,const int now_vpos); int getX(int now_vpos,const CHAT_SLOT_ITEM* item,int video_width); #endif /*PROCESS_CHAT_H_*/ diff --git a/vhook/comment/com_surface.c b/vhook/comment/com_surface.c index 8841821..98a8910 100644 --- a/vhook/comment/com_surface.c +++ b/vhook/comment/com_surface.c @@ -11,9 +11,9 @@ #include "shadow.h" -SDL_Surface* drawText(DATA* data,int size,int color,Uint16* str); +SDL_Surface* drawText(COMMDATA* data,int size,int color,Uint16* str); -SDL_Surface* makeCommentSurface(DATA* data,const CHAT_ITEM* item,int video_width,int video_height){ +SDL_Surface* makeCommentSurface(COMMDATA* data,const CHAT_ITEM* item,int video_width,int video_height){ Uint16* index = item->str; Uint16* last = item->str; SDL_Surface* ret = NULL; @@ -43,26 +43,26 @@ SDL_Surface* makeCommentSurface(DATA* data,const CHAT_ITEM* item,int video_width } if(ret->w == 0 || ret->h == 0){ - fprintf(data->log,"[comsurface/make]comment %04d has no char.\n",item->no); - fflush(data->log); + fprintf(data->common->log,"[comsurface/make]comment %04d has no char.\n",item->no); + fflush(data->common->log); return ret; } /* * ‰eˆ— */ - int shadow = data->shadow_kind; + int shadow = data->common->shadow_kind; if(shadow >= SHADOW_MAX){ shadow = SHADOW_DEFAULT; } - ret = (*ShadowFunc[shadow])(ret,item->color == CMD_COLOR_BLACK,data->fontsize_fix); + ret = (*ShadowFunc[shadow])(ret,item->color == CMD_COLOR_BLACK,data->common->fontsize_fix); /* * ƒAƒ‹ƒtƒ@’l‚̐ݒè */ if(!data->opaque_comment){ float alpha_t = (((float)(item->no)/(item->chat->max_no)) * 0.4) + 0.6; - fprintf(data->log,"[comsurface/make]comment %04d set alpha:%5.2f%%.\n",item->no,alpha_t*100); + fprintf(data->common->log,"[comsurface/make]comment %04d set alpha:%5.2f%%.\n",item->no,alpha_t*100); setAlpha(ret,alpha_t); } @@ -74,7 +74,7 @@ SDL_Surface* makeCommentSurface(DATA* data,const CHAT_ITEM* item,int video_width //double zoomy = 1.0f; //k¬ - if(data->fontsize_fix){ + if(data->common->fontsize_fix){ zoomx = (0.5f * (double)video_width) / (double)NICO_WIDTH; //zoomy = (0.5f * (double)video_height) / (double)NICO_HEIGHT; } @@ -94,8 +94,8 @@ SDL_Surface* makeCommentSurface(DATA* data,const CHAT_ITEM* item,int video_width //if(zoomx != 1.0f || zoomy != 1.0f){ if(zoomx != 1.0f){ //fprintf(data->log,"[comsurface/make]comment %04d resized.(%5.2f%%,%5.2f%%)\n",item->no,zoomx*100,zoomy*100); - fprintf(data->log,"[comsurface/make]comment %04d resized.(%5.2f%%)\n",item->no,zoomx*100); - fflush(data->log); + fprintf(data->common->log,"[comsurface/make]comment %04d resized.(%5.2f%%)\n",item->no,zoomx*100); + fflush(data->common->log); SDL_Surface* tmp = ret; ret = zoomSurface(tmp,zoomx,zoomx,SMOOTHING_ON); SDL_FreeSurface(tmp); @@ -107,7 +107,7 @@ SDL_Surface* makeCommentSurface(DATA* data,const CHAT_ITEM* item,int video_width * •¶Žš‚ð•`‰æ */ -SDL_Surface* drawText(DATA* data,int size,int color,Uint16* str){ +SDL_Surface* drawText(COMMDATA* data,int size,int color,Uint16* str){ if(str[0] == '\0'){ return SDL_CreateRGBSurface( SDL_SRCALPHA | SDL_HWSURFACE | SDL_HWACCEL, 0,COMMENT_FONT_SIZE[size],32, @@ -148,6 +148,6 @@ SDL_Surface* drawText(DATA* data,int size,int color,Uint16* str){ SDL_FreeSurface(tmp); SDL_FreeSurface(fmt); */ - SDL_Surface* surf = TTF_RenderUNICODE_Blended(data->font[size],str,COMMENT_COLOR[color]); + SDL_Surface* surf = TTF_RenderUNICODE_Blended(data->common->font[size],str,COMMENT_COLOR[color]); return surf; } diff --git a/vhook/comment/com_surface.h b/vhook/comment/com_surface.h index 52c2759..f5965da 100644 --- a/vhook/comment/com_surface.h +++ b/vhook/comment/com_surface.h @@ -5,7 +5,7 @@ #include "../chat/chat_slot.h" #include "../main.h" -SDL_Surface* makeCommentSurface(DATA* data,const CHAT_ITEM* item,int video_width,int video_height); +SDL_Surface* makeCommentSurface(COMMDATA* data,const CHAT_ITEM* item,int video_width,int video_height); #endif /*COM_SURFACE_H_*/ diff --git a/vhook/main.c b/vhook/main.c index e5b60ea..22fa905 100644 --- a/vhook/main.c +++ b/vhook/main.c @@ -33,12 +33,15 @@ int init(FILE* log){ */ int initData(DATA* data,FILE* log,const SETTING* setting){ int i; - data->enable_user_comment = setting->enable_user_comment; - data->enable_owner_comment = setting->enable_owner_comment; + data->user_comment.common = data; + data->owner_comment.common = data; + data->user_comment.enable = setting->enable_user_comment; + data->owner_comment.enable = setting->enable_owner_comment; + data->user_comment.opaque_comment = setting->opaque_comment; + data->owner_comment.opaque_comment = 1; // ƒI[ƒiƒRƒƒ“ƒg‚͏í‚É•s“§–¾ data->log = log; data->fontsize_fix = setting->fontsize_fix; data->show_video = setting->show_video; - data->opaque_comment = setting->opaque_comment; data->shadow_kind = setting->shadow_kind; data->process_first_called=FALSE; data->video_length = setting->video_length; @@ -71,17 +74,17 @@ int initData(DATA* data,FILE* log,const SETTING* setting){ /* * ƒ†[ƒUƒRƒƒ“ƒg */ - if(data->enable_user_comment){ + if(data->user_comment.enable){ fputs("[main/init]User Comment is enabled.\n",log); //ƒRƒƒ“ƒgƒf[ƒ^ - if(initChat(log,&data->chat,setting->data_user_path,&data->slot,data->video_length)){ + if(initChat(log,&data->user_comment.chat,setting->data_user_path,&data->user_comment.slot,data->video_length)){ fputs("[main/init]initialized comment.\n",log); }else{ fputs("[main/init]failed to initialize comment.",log); return FALSE; } //ƒRƒƒ“ƒgƒXƒƒbƒg - if(initChatSlot(log,&data->slot,setting->user_slot_max,&data->chat)){ + if(initChatSlot(log,&data->user_comment.slot,setting->user_slot_max,&data->user_comment.chat)){ fputs("[main/init]initialized comment slot.\n",log); }else{ fputs("[main/init]failed to initialize comment slot.",log); @@ -91,8 +94,23 @@ int initData(DATA* data,FILE* log,const SETTING* setting){ /* * ƒI[ƒiƒRƒƒ“ƒg */ - if(data->enable_owner_comment){ + if(data->owner_comment.enable){ fputs("[main/init]Owner Comment is enabled.\n",log); + //ƒRƒƒ“ƒgƒf[ƒ^ + if(initChat(log,&data->owner_comment.chat,setting->data_owner_path,&data->owner_comment.slot,data->video_length)){ + fputs("[main/init]initialized comment.\n",log); + }else{ + fputs("[main/init]failed to initialize comment.",log); + return FALSE; + } + //ƒRƒƒ“ƒgƒXƒƒbƒg + // TODO ‚Æ‚è‚ ‚¦‚¸Å‘吔‚Í1024‚É‚µ‚Ä‚¨‚­‚ª... + if(initChatSlot(log,&data->owner_comment.slot,1024,&data->owner_comment.chat)){ + fputs("[main/init]initialized comment slot.\n",log); + }else{ + fputs("[main/init]failed to initialize comment slot.",log); + return FALSE; + } } //I‚í‚èB @@ -138,12 +156,14 @@ int main_process(DATA* data,SDL_Surface* surf,const int now_vpos){ int closeData(DATA* data){ int i; //ƒ†[ƒUƒRƒƒ“ƒg‚ª—LŒø‚È‚çŠJ•ú - if(data->enable_user_comment){ - closeChat(&data->chat); - closeChatSlot(&data->slot); + if(data->user_comment.enable){ + closeChat(&data->user_comment.chat); + closeChatSlot(&data->user_comment.slot); } //ƒI[ƒiƒRƒƒ“ƒg‚ª—LŒø‚È‚çŠJ•ú - if(data->enable_owner_comment){ + if(data->owner_comment.enable){ + closeChat(&data->owner_comment.chat); + closeChatSlot(&data->owner_comment.slot); } //ƒtƒHƒ“ƒgŠJ•ú for(i=0;i - + @@ -53,17 +53,13 @@ localhost - MinGW|MinGW + MinGW_sjlj|MinGW 3 - - - f:/mingw/include - - - dist/Debug/${PLATFORM}/nicovideodbg.dll + dist/Debug/${CND_PLATFORM}/nicovideodbg.dll + false SDL_gfx SDLmain @@ -72,103 +68,26 @@ - - 0 - - - 3 - - - 0 - - - 3 - - - 0 - - - 3 - - - 0 - - - 3 - - - 0 - - - 3 - - - 0 - - - 3 - - - 3 - - - 0 - - - 3 - - - 3 - - - 0 - - - 3 - - - 3 - - - 3 - - - 0 - - - 3 - - - 3 - - - 0 - - - 3 - localhost - MinGW|MinGW + MinGW_sjlj|MinGW 3 - + 6 - - f:/mingw/include - - - + + 5 - + 5 - dist/Release/${PLATFORM}/nicovideo.dll + dist/Release/${CND_PLATFORM}/nicovideo.dll + false SDL_gfx SDLmain @@ -177,81 +96,6 @@ - - 0 - - - 3 - - - 0 - - - 3 - - - 0 - - - 3 - - - 0 - - - 3 - - - 0 - - - 3 - - - 0 - - - 3 - - - 3 - - - 0 - - - 3 - - - 3 - - - 0 - - - 3 - - - 3 - - - 3 - - - 0 - - - 3 - - - 3 - - - 0 - - - 3 - diff --git a/vhook/process.c b/vhook/process.c index 008c774..cb9498c 100644 --- a/vhook/process.c +++ b/vhook/process.c @@ -7,14 +7,18 @@ //ƒvƒƒZƒX int process(DATA* data,SDL_Surface* surf,const int now_vpos){ //ƒ†[ƒUƒRƒƒ“ƒg - if(data->enable_user_comment){ - if(!chat_process(data,surf,now_vpos)){ + if(data->user_comment.enable){ + if(!chat_process(&data->user_comment,surf,now_vpos)){ fputs("[process/process]failed to process comment.\n",data->log); return FALSE; } } //ƒI[ƒiƒRƒƒ“ƒg - if(data->enable_owner_comment){ + if(data->owner_comment.enable){ + if(!chat_process(&data->owner_comment,surf,now_vpos)){ + fputs("[process/process]failed to process comment.\n",data->log); + return FALSE; + } } return TRUE; } diff --git a/vhook/struct_define.h b/vhook/struct_define.h index 65b2715..e084e5a 100644 --- a/vhook/struct_define.h +++ b/vhook/struct_define.h @@ -2,6 +2,7 @@ #define STRUCT_DEFINE_H_ typedef struct DATA DATA; +typedef struct COMMDATA COMMDATA; typedef struct CHAT CHAT; typedef struct CHAT_ITEM CHAT_ITEM; typedef struct CHAT_SLOT CHAT_SLOT; -- 2.11.0