X-Git-Url: http://git.sourceforge.jp/view?p=coroid%2Finqubus.git;a=blobdiff_plain;f=vhook%2Fmain.h;h=fffd1a457bb3a22f1b7a7548d4e878f1893e97cb;hp=edd0efc86500c0a0aa58d85a0139c5df3ea1f174;hb=549c64bd2d4497c123c0674d39e30e4f00f045bd;hpb=23c3b8813253bc5c4b4f569c1ae45cfafeffe635

diff --git a/vhook/main.h b/vhook/main.h
index edd0efc..fffd1a4 100644
--- a/vhook/main.h
+++ b/vhook/main.h
@@ -1,54 +1,70 @@
-#ifndef MAIN_H_
-#define MAIN_H_
-#include <SDL/SDL.h>
-#include <SDL/SDL_ttf.h>
-#include "nicodef.h"
-#include "struct_define.h"
-#include "chat/chat.h"
-#include "chat/chat_slot.h"
-
-struct DATA{
-	FILE* log;
-	TTF_Font* font[CMD_FONT_MAX];
-	SDL_Surface* screen;
-	/*‚»‚ꂼ‚ê‚̃Rƒƒ“ƒg‚ɉž‚¶‚½ƒf[ƒ^*/
-	//ƒ†[ƒUƒRƒƒ“ƒg
-	int enable_user_comment;
-	CHAT chat;
-	CHAT_SLOT slot;
-	//“ŠeŽÒƒRƒƒ“ƒg
-	int enable_owner_comment;
-	
-	//ˆê”Ê“I‚ȃf[ƒ^
-	int shadow_kind;
-	int show_video;
-	int fontsize_fix;
-	int opaque_comment;
-	int process_first_called;
-	int video_length;
-};
-
-typedef struct SETTING{
-	const char* data_user_path;
-	const char* data_owner_path;
-	const char* font_path;
-	int video_length;
-	int font_index;
-	int user_slot_max;
-	int owner_slot_max;
-	int shadow_kind;
-	/*TRUE OR FALSE*/
-	int enable_user_comment;
-	int enable_owner_comment;
-	int show_video;
-	int fontsize_fix;
-	int opaque_comment;
-}SETTING;
-
-int init(FILE* log);
-int initData(DATA* data,FILE* log,const SETTING* setting);
-int main_process(DATA* data,SDL_Surface* surf,const int now_vpos);
-int closeData(DATA* data);
-int close();
-
-#endif /*MAIN_H_*/
+#ifndef MAIN_H_
+#define MAIN_H_
+#include <SDL/SDL.h>
+#include <SDL/SDL_ttf.h>
+#include "nicodef.h"
+#include "struct_define.h"
+#include "chat/chat.h"
+#include "chat/chat_slot.h"
+
+struct COMMDATA {
+    int enable;
+    CHAT chat;
+    CHAT_SLOT slot;
+    int opaque_comment;
+    DATA* common;
+};
+
+struct DATA{
+	FILE* log;
+	TTF_Font* font[CMD_FONT_MAX];
+	SDL_Surface* screen;
+//	/*それぞれのコメントに応じたデータ*/
+//	//ユーザコメント
+//	int enable_user_comment;
+//	CHAT chat;
+//	CHAT_SLOT slot;
+//	//投稿者コメント
+//	int enable_owner_comment;
+        COMMDATA user_comment;
+        COMMDATA owner_comment;
+	
+	//一般的なデータ
+	int shadow_kind;
+	int show_video;
+	int fontsize_fix;
+	int process_first_called;
+	int video_length;
+    int aspect_mode;
+};
+
+typedef struct SETTING{
+	const char* data_user_path;
+	const char* data_owner_path;
+	const char* font_path;
+	int video_length;
+	int font_index;
+	int user_slot_max;
+	int owner_slot_max;
+	int shadow_kind;
+	/*TRUE OR FALSE*/
+	int enable_user_comment;
+	int enable_owner_comment;
+	int show_video;
+	int fontsize_fix;
+	int opaque_comment;
+    /**
+     * アスペクト比の指定. コメントのフォントサイズや速度に影響する.
+     * 0 - 4:3
+     * 1 - 16:9
+     */
+    int aspect_mode;
+}SETTING;
+
+int init(FILE* log);
+int initData(DATA* data,FILE* log,const SETTING* setting);
+int main_process(DATA* data,SDL_Surface* surf,const int now_vpos);
+int closeData(DATA* data);
+int close();
+
+#endif /*MAIN_H_*/