opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-10-28 02:34:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed locale code, added locale files, made wx use locale files, fixed some bugs, and added platform-specific files to the main program

Browse Source
This commit is contained in:
jp9000
2013-12-07 10:22:56 -07:00
parent a899606d53
commit 70290b8c2b
21 changed files with 278 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libobs/obs-cocoa.c
+2 -2
View File
@@ -47,7 +47,7 @@ char *find_plugin(const char *plugin)
char *find_libobs_data_file(const char *file)
{
struct dstr path;
dstr_init_copy(&path, "../libobs/");
dstr_init_copy(&path, "../data/libobs/");
dstr_cat(&path, file);
return path.array;
}
@@ -55,7 +55,7 @@ char *find_libobs_data_file(const char *file)
char *obs_find_plugin_file(const char *file)
{
struct dstr path;
dstr_init_copy(&path, "../data/");
dstr_init_copy(&path, "../data/obs-plugins/");
dstr_cat(&path, file);
return path.array;
}
libobs/obs-windows.c
+2 -2
View File
@@ -37,7 +37,7 @@ char *find_plugin(const char *plugin)
char *find_libobs_data_file(const char *file)
{
struct dstr path;
dstr_init_copy(&path, "../../libobs/");
dstr_init_copy(&path, "../../data/libobs/");
dstr_cat(&path, file);
return path.array;
}
@@ -46,7 +46,7 @@ char *find_libobs_data_file(const char *file)
char *obs_find_plugin_file(const char *file)
{
struct dstr path;
dstr_init_copy(&path, "../../data/");
dstr_init_copy(&path, "../../data/obs-plugins/");
dstr_cat(&path, file);
return path.array;
}
libobs/util/config-file.c
+3 -3
View File
@@ -340,11 +340,11 @@ static struct config_item *config_find_item(struct darray *sections,
struct config_section *sec = darray_item(
sizeof(struct config_section), sections, i);
if (astrcmpi(sec->name, section) != 0) {
if (astrcmpi(sec->name, section) == 0) {
for (j = 0; j < sec->items.num; j++) {
struct config_item *item = darray_item(
sizeof(struct config_item),
&sec->items, i);
&sec->items, j);
if (astrcmpi(item->name, name) == 0)
return item;
@@ -369,7 +369,7 @@ static void config_set_item(struct darray *sections, const char *section,
if (astrcmpi(cur_sec->name, section) == 0) {
for (j = 0; j < cur_sec->items.num; j++) {
item = items+i;
item = items+j;
if (astrcmpi(item->name, name) == 0) {
bfree(item->value);
libobs/util/darray.h
+3 -2
View File
@@ -171,8 +171,9 @@ static inline void darray_move(struct darray *dst, struct darray *src)
{
darray_free(dst);
memcpy(dst, src, sizeof(struct darray));
src->array = NULL;
src->num = 0;
src->array = NULL;
src->capacity = 0;
src->num = 0;
}
static inline size_t darray_find(const size_t element_size,
libobs/util/lexer.c
+2 -1
View File
@@ -271,7 +271,7 @@ bool lexer_getbasetoken(struct lexer *lex, struct base_token *token,
token_start = offset-1;
type = new_type;
if (type != BASETOKEN_DIGIT ||
if (type != BASETOKEN_DIGIT &&
type != BASETOKEN_ALPHA) {
if (is_newline(ch) &&
is_newline_pair(ch, *offset)) {
@@ -280,6 +280,7 @@ bool lexer_getbasetoken(struct lexer *lex, struct base_token *token,
break;
}
} else if (type != new_type) {
offset--;
break;
}
}
libobs/util/text-lookup.c
+45 -12
View File
@@ -33,10 +33,11 @@ struct text_leaf {
char *lookup, *value;
};
static inline void text_leaf_free(struct text_leaf *leaf)
static inline void text_leaf_destroy(struct text_leaf *leaf)
{
bfree(leaf->lookup);
bfree(leaf->value);
bfree(leaf);
}
/* ------------------------------------------------------------------------- */
@@ -60,7 +61,7 @@ static void text_node_destroy(struct text_node *node)
for (i = 0; i < node->subnodes.num; i++)
text_node_destroy(subnodes[i]);
if (node->leaf)
text_leaf_free(node->leaf);
text_leaf_destroy(node->leaf);
darray_free(&node->subnodes);
bfree(node);
}
@@ -171,7 +172,7 @@ static bool lookup_addstring(const char *lookup_val, struct text_leaf *leaf,
else
lookup_splitnode(lookup_val, len, leaf, child);
} else {
lookup_createsubnode(lookup_val, leaf, child);
lookup_createsubnode(lookup_val, leaf, node);
}
return true;
@@ -187,7 +188,7 @@ static void lookup_getstringtoken(struct lexer *lex, struct strref *token)
if (*temp == '\\') {
was_backslash = true;
} else if (*temp == '"') {
++temp;
temp++;
break;
}
} else {
@@ -197,8 +198,16 @@ static void lookup_getstringtoken(struct lexer *lex, struct strref *token)
++temp;
}
/* include starting " char */
token->len += (size_t)(temp - lex->offset - 1);
token->len += (size_t)(temp - lex->offset);
if (*token->array == '"') {
token->array++;
token->len--;
}
if (*(temp-1) == '"')
token->len--;
lex->offset = temp;
}
@@ -217,19 +226,26 @@ static bool lookup_gettoken(struct lexer *lex, struct strref *str)
if (ch == '#') {
while(ch != '\n' && ch != 0)
ch = *(++lex->offset);
} else if (temp.type == BASETOKEN_WHITESPACE) {
strref_copy(str, &temp.text);
break;
} else {
strref_copy(str, &temp.text);
if (ch == '"') {
lookup_getstringtoken(lex, str);
break;
} else if (ch == '=') {
break;
}
}
} else {
if (temp.type == BASETOKEN_WHITESPACE) {
if (temp.type == BASETOKEN_WHITESPACE ||
*temp.text.array == '=') {
lex->offset -= temp.text.len;
break;
}
if (ch == '"') {
lookup_getstringtoken(lex, str);
break;
} else if (ch == '#') {
if (ch == '#') {
lex->offset--;
break;
}
@@ -260,12 +276,27 @@ static inline bool lookup_goto_nextline(struct lexer *p)
return success;
}
static char *convert_string(const char *str, size_t len)
{
struct dstr out;
out.array = bstrdup_n(str, len);
out.capacity = len+1;
out.len = len;
dstr_replace(&out, "\\n", "\n");
dstr_replace(&out, "\\t", "\t");
dstr_replace(&out, "\\r", "\r");
return out.array;
}
static void lookup_addfiledata(struct text_lookup *lookup,
const char *file_data)
{
struct lexer lex;
struct strref name, value;
lexer_init(&lex);
lexer_start(&lex, file_data);
strref_clear(&name);
strref_clear(&value);
@@ -288,13 +319,15 @@ getval:
leaf = bmalloc(sizeof(struct text_leaf));
leaf->lookup = bstrdup_n(name.array, name.len);
leaf->value = bstrdup_n(value.array, value.len);
leaf->value = convert_string(value.array, value.len);
lookup_addstring(leaf->lookup, leaf, lookup->top);
if (!lookup_goto_nextline(&lex))
break;
}
lexer_free(&lex);
}
static inline bool lookup_getstring(const char *lookup_val,