vss.c: rename get_song() to vss_get_audio_file()

[paraslash.git] / vss.c

diff --git a/vss.c b/vss.c
index 122476064154b1d587a2403eea61384567dcbb6b..50c86ed7d8ef7069e6d9baea3df7d18c7e6ae3c2 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -259,7 +259,7 @@ static int update_mmd(void)
        return 1;
 }
 
-static void get_song(void)
+static void vss_get_audio_file(void)
 {
        char **sl = selectors[mmd->selector_num].get_audio_file_list(10);
        int i;
@@ -381,7 +381,6 @@ static void vss_eof(struct audio_format_handler *af)
        mmd->afi.seconds_total = 0;
        free(mmd->afi.chunk_table);
        mmd->afi.chunk_table = NULL;
-       PARA_ERROR_LOG("freeing header %p\n", mmd->afi.header);
        free(mmd->afi.header);
        mmd->afi.header = NULL;
        tmp  = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_INFO1],
@@ -496,7 +495,7 @@ again:
        if (!ret && !audio_file && vss_playing() &&
                        !(mmd->new_vss_status_flags & VSS_NOMORE)) {
                PARA_DEBUG_LOG("%s", "ready and playing, but no audio file\n");
-               get_song();
+               vss_get_audio_file();
                goto again;
        }
        return ret;
@@ -505,12 +504,10 @@ again:
 /**
  * read a chunk of data from the current audio file
  *
- * \param current_chunk the chunk number to read
- *
  * \return The length of the chunk on success, zero on end of file, negative on
  * errors.  Note: If the current chunk is of length zero, but the end of the
  * file is not yet reached, this function returns -E_EMPTY_CHUNK.
- * */
+ */
 ssize_t vss_read_chunk(void)
 {
        ssize_t len;
@@ -544,9 +541,6 @@ ssize_t vss_read_chunk(void)
  * the current audio format handler to obtain a pointer to the data to be
  * sent out as well as its length. This information is then passed to each
  * supported sender's send() function which does the actual sending.
- *
- * Return value: Positive return value on success, zero on eof and negative
- * on errors.
  */
 void vss_send_chunk(void)
 {