X-Git-Url: http://git.sourceforge.jp/view?p=coroid%2Finqubus.git;a=blobdiff_plain;f=vhook%2Fmain.c;h=22fa9054d07744da0413bbb25c9805a4d4d126bd;hp=e5b60eafec2d6c6a5f61e7d73010c65ba7130084;hb=3eace454dae0d70ad8f57f808af76f53c1258c60;hpb=23c3b8813253bc5c4b4f569c1ae45cfafeffe635

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<CMD_FONT_MAX;i++){