Load studio (part 1)
This commit is contained in:
parent
64f3eeb654
commit
7361fa7f23
26
catdup.c
26
catdup.c
|
@ -50,3 +50,29 @@ char * catdup(const char * s1, const char * s2)
|
|||
|
||||
return buffer;
|
||||
}
|
||||
|
||||
char * catdup3(const char * s1, const char * s2, const char * s3)
|
||||
{
|
||||
char * buffer;
|
||||
size_t s1_len, s2_len, s3_len;
|
||||
|
||||
assert(s1 != NULL && s2 != NULL && s3 != NULL);
|
||||
|
||||
s1_len = strlen(s1);
|
||||
s2_len = strlen(s2);
|
||||
s3_len = strlen(s3);
|
||||
|
||||
buffer = malloc(s1_len + s2_len + s3_len + 1);
|
||||
if (buffer == NULL)
|
||||
{
|
||||
lash_error("malloc() failed.");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
memcpy(buffer, s1, s1_len);
|
||||
memcpy(buffer + s1_len, s2, s2_len);
|
||||
memcpy(buffer + s1_len + s2_len, s3, s3_len);
|
||||
buffer[s1_len + s2_len + s3_len] = 0;
|
||||
|
||||
return buffer;
|
||||
}
|
||||
|
|
1
catdup.h
1
catdup.h
|
@ -28,5 +28,6 @@
|
|||
#define CATDUP_H__D42302F1_4D96_4EE4_AC09_E97ED5748277__INCLUDED
|
||||
|
||||
char * catdup(const char * s1, const char * s2);
|
||||
char * catdup3(const char * s1, const char * s2, const char * s3);
|
||||
|
||||
#endif /* #ifndef CATDUP_H__D42302F1_4D96_4EE4_AC09_E97ED5748277__INCLUDED */
|
||||
|
|
|
@ -1039,6 +1039,7 @@ bool studios_iterate(void * call_ptr, void * context, bool (* callback)(void * c
|
|||
return false;
|
||||
}
|
||||
|
||||
/* TODO: unescape */
|
||||
dentry->d_name[len - 4] = 0;
|
||||
|
||||
if (stat(path, &st) != 0)
|
||||
|
@ -1063,12 +1064,49 @@ bool studios_iterate(void * call_ptr, void * context, bool (* callback)(void * c
|
|||
|
||||
bool studio_load(void * call_ptr, const char * studio_name)
|
||||
{
|
||||
char * path;
|
||||
struct stat st;
|
||||
|
||||
lash_info("Loading studio '%s'", studio_name);
|
||||
|
||||
/* TODO: unescape */
|
||||
path = catdup3(g_studios_dir, studio_name, ".xml");
|
||||
if (path == NULL)
|
||||
{
|
||||
lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "catdup3() failed to compose path of studio \%s\" file", studio_name);
|
||||
return false;
|
||||
}
|
||||
|
||||
lash_info("'%s'", path);
|
||||
|
||||
if (stat(path, &st) != 0)
|
||||
{
|
||||
lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "failed to stat '%s': %d (%s)", path, errno, strerror(errno));
|
||||
free(path);
|
||||
return false;
|
||||
}
|
||||
|
||||
studio_clear();
|
||||
|
||||
lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "Not implemented yet");
|
||||
return false;
|
||||
g_studio.name = strdup(studio_name);
|
||||
if (g_studio.name == NULL)
|
||||
{
|
||||
lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "strdup(\"%s\") failed", studio_name);
|
||||
free(path);
|
||||
return false;
|
||||
}
|
||||
|
||||
g_studio.filename = path;
|
||||
|
||||
/* TODO: load jack params from xml */
|
||||
|
||||
studio_activate();
|
||||
|
||||
if (!jack_proxy_start_server())
|
||||
{
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void emit_studio_renamed()
|
||||
|
|
Loading…
Reference in New Issue