projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
openssl: Fix memory leak in read_rsa_bignums().
[paraslash.git]
/
playlist.c
diff --git
a/playlist.c
b/playlist.c
index 9616ed0f0dd6dc9a215e4782375cd6fa081f187d..5f83b0fe0a35c9e5c31c97828bfa7af2bebc6208 100644
(file)
--- a/
playlist.c
+++ b/
playlist.c
@@
-1,11
+1,8
@@
-/*
- * Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
#include <regex.h>
#include <osl.h>
#include <regex.h>
#include <osl.h>
+#include <lopsub.h>
#include "para.h"
#include "error.h"
#include "para.h"
#include "error.h"
@@
-139,7
+136,7
@@
int playlist_check_callback(struct afs_callback_arg *aca)
/**
* Close the current playlist.
*
/**
* Close the current playlist.
*
- * \sa playlist_open().
+ * \sa
\ref
playlist_open().
*/
void playlist_close(void)
{
*/
void playlist_close(void)
{
@@
-159,13
+156,13
@@
void playlist_close(void)
*
* \return Standard.
*/
*
* \return Standard.
*/
-int playlist_open(char *name)
+int playlist_open(c
onst c
har *name)
{
struct osl_object obj;
int ret;
struct osl_row *row;
{
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) {
obj.size = strlen(obj.data);
ret = osl(osl_get_row(playlists_table, BLOBCOL_NAME, &obj, &row));
if (ret < 0) {
@@
-191,8
+188,6
@@
static int handle_audio_file_event(enum afs_events event, void *data)
char *new_path;
const struct osl_row *row = 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)
if (event == AUDIO_FILE_RENAME) {
ret = row_belongs_to_score_table(row, NULL);
if (ret < 0)
@@
-237,7
+232,9
@@
int playlists_event_handler(enum afs_events event,
int ret;
struct afsi_change_event_data *aced = data;
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:
case AFSI_CHANGE:
return playlist_update_audio_file(aced->aft_row);
case AUDIO_FILE_RENAME: