comparison src/audacious/input.c @ 2394:e2aaa7dca389 trunk

[svn] - tuple->file_name coming from input plugins have a string with filename + extension, but tuple->file_name coming from input plugins without a get_song_tuple have a string with filename without extension; fix this incongruency, always pass tuple->filename with a string containing filename + extension

2393:a8800fd3cb1c

TitleInput *
input_get_song_tuple(const gchar * filename)
{
    InputPlugin *ip = NULL;
    TitleInput *input;
    gchar *tmp = NULL, *ext;
    gchar *filename_proxy;

    if (filename == NULL)
    return NULL;

        input = ip->get_song_tuple(filename_proxy);
    else
    {
        input = bmp_title_input_new();

        tmp = g_strdup(filename);
        if ((ext = strrchr(tmp, '.')))
            *ext = '\0';

        input->track_name = NULL;
        input->length = -1;
        input_get_song_info(filename, &input->track_name, &input->length);
        input->file_name = g_path_get_basename(tmp);
        input->file_ext = ext ? ext + 1 : NULL;
        input->file_path = g_path_get_dirname(tmp);
    }

    return input;
}

2394:e2aaa7dca389

TitleInput *
input_get_song_tuple(const gchar * filename)
{
    InputPlugin *ip = NULL;
    TitleInput *input;
    gchar *ext = NULL;
    gchar *filename_proxy;

    if (filename == NULL)
    return NULL;

        input = ip->get_song_tuple(filename_proxy);
    else
    {
        input = bmp_title_input_new();

        ext = strrchr(filename, '.');

        input->track_name = NULL;
        input->length = -1;
        input_get_song_info(filename, &input->track_name, &input->length);
        input->file_name = g_path_get_basename(filename);
        input->file_ext = ( ( ext != NULL ) ? g_strdup(ext + 1) : NULL );
        input->file_path = g_path_get_dirname(filename);
    }

    return input;
}