"\tCreate database name containing the initial columns for basic\n"
"\tinteroperation with server. This command has to be used only once\n"
-"\twhen you use the mysql database tool for the very first time.\n"
+"\twhen you use the mysql audio file selector for the very first time.\n"
"\n"
"\tThe optional name defaults to 'paraslash' if not given.\n"
.help =
"\tIf pattern was not given, print list of all audio files known\n"
-"\tto the mysql database tool. See the documentation of mysql\n"
+"\tto the mysql selector. See the documentation of mysql\n"
"\tfor the definition of LIKE patterns.\n"
},
* This is called from server and from some commands. Name must not be NULL
* Never returns NULL.
*/
-static char *get_dbinfo(char *name)
+static char *get_selector_info(char *name)
{
char *meta = NULL, *atts = NULL, *info, *dir = NULL, *query, *stream = NULL;
void *result = NULL;
static void update_mmd(char *info)
{
PARA_DEBUG_LOG("%s", "updating shared memory area\n");
- strncpy(mmd->dbinfo, info, MMD_INFO_SIZE - 1);
- mmd->dbinfo[MMD_INFO_SIZE - 1] = '\0';
+ strncpy(mmd->selector_info, info, MMD_INFO_SIZE - 1);
+ mmd->selector_info[MMD_INFO_SIZE - 1] = '\0';
}
static void update_audio_file_server_handler(char *name)
{
char *info;
- info = get_dbinfo(name);
+ info = get_selector_info(name);
update_mmd(info);
free(info);
update_audio_file(name);
return update_audio_file(argv[1]);
}
-static void refresh_mmd_dbinfo(void)
+static void refresh_selector_info(void)
{
char *name = get_current_audio_file();
char *info;
if (!name)
return;
- info = get_dbinfo(name);
+ info = get_selector_info(name);
free(name);
mmd_lock();
update_mmd(info);
"'current_stream'", row[0]);
ret = real_query(query);
free(query);
- refresh_mmd_dbinfo();
+ refresh_selector_info();
out:
free(stream);
if (result)
ret = change_stream(argv[1]);
if (ret < 0)
goto out;
- refresh_mmd_dbinfo();
+ refresh_selector_info();
}
if (csp) {
mmd_lock();
for (; argv[i] && ret >= 0; i++)
ret = update_atts(fd, argv[i], atts);
}
- refresh_mmd_dbinfo();
+ refresh_selector_info();
out:
return ret;
}
/* mmd lock must be held */
static void write_msg2mmd(int success)
{
- sprintf(mmd->dbinfo, "dbinfo1:%s\ndbinfo2:mysql-%s\ndbinfo3:\n",
+ sprintf(mmd->selector_info, "dbinfo1:%s\ndbinfo2:mysql-%s\ndbinfo3:\n",
success < 0? PARA_STRERROR(-success) :
"successfully connected to mysql server",
success < 0? "" : mysql_get_server_info(mysql_ptr));
}
/**
- * the init function of the mysql-based database tool
+ * the init function of the mysql-based audio file selector
*
* Check the command line options and initialize all function pointers of \a db.
- * Connect to the mysql server and initialize the dbinfo string.
+ * Connect to the mysql server and initialize the info string.
*
- * \sa struct audio_file_selector, misc_meta_data::dbinfo, random_selector.c
+ * \sa struct audio_file_selector, misc_meta_data::selector_info,
+ * random_selector.c
*/
int mysql_selector_init(struct audio_file_selector *db)
{