server: Convert com_mvatt() to lopsub.

[paraslash.git] / playlist.c

diff --git a/playlist.c b/playlist.c
index 9616ed0f0dd6dc9a215e4782375cd6fa081f187d..b9e52c75672f9ada9ad4a949f5fa0747369db3e6 100644 (file)
--- a/playlist.c
+++ b/playlist.c
@@ -6,6 +6,7 @@
 
 #include <regex.h>
 #include <osl.h>
+#include <lopsub.h>
 
 #include "para.h"
 #include "error.h"
@@ -159,13 +160,13 @@ void playlist_close(void)
  *
  * \return Standard.
  */
-int playlist_open(char *name)
+int playlist_open(const char *name)
 {
        struct osl_object obj;
        int ret;
        struct osl_row *row;
 
-       obj.data = name;
+       obj.data = (char *)name;
        obj.size = strlen(obj.data);
        ret = osl(osl_get_row(playlists_table, BLOBCOL_NAME, &obj, &row));
        if (ret < 0) {
@@ -191,8 +192,6 @@ static int handle_audio_file_event(enum afs_events event, void *data)
        char *new_path;
        const struct osl_row *row = data;
 
-       if (!current_playlist.name)
-               return 1;
        if (event == AUDIO_FILE_RENAME) {
                ret = row_belongs_to_score_table(row, NULL);
                if (ret < 0)
@@ -237,7 +236,9 @@ int playlists_event_handler(enum afs_events event,
        int ret;
        struct afsi_change_event_data *aced = data;
 
-       switch(event) {
+       if (!current_playlist.name)
+               return 1;
+       switch (event) {
        case AFSI_CHANGE:
                return playlist_update_audio_file(aced->aft_row);
        case AUDIO_FILE_RENAME: