comparison src/vorbis/vorbis.c @ 1433:d557d987e42d

vorbis: new tuple API

1429:b274ac478607

#include "audacious/plugin.h"
#include "audacious/output.h"
#include "audacious/util.h"
#include "audacious/configdb.h"
#include "audacious/titlestring.h"
#include <audacious/i18n.h>
#include <audacious/strings.h>

#include "vorbis.h"

extern vorbis_config_t vorbis_cfg;

static TitleInput *get_song_tuple(gchar *filename);
static int vorbis_check_file(char *filename);
static int vorbis_check_fd(char *filename, VFSFile *stream);
static void vorbis_play(InputPlayback *data);
static void vorbis_stop(InputPlayback *data);
static void vorbis_pause(InputPlayback *data, short p);

}

static void
vorbis_get_song_info(char *filename, char **title, int *length)
{
    TitleInput *tuple = get_song_tuple(filename);

    *length = tuple->length;
    *title = xmms_get_titlestring(vorbis_cfg.tag_override ?
                                  vorbis_cfg.tag_format :
                                  xmms_get_gentitle_format(),
                                  tuple);

    bmp_title_input_free(tuple);
}

static const gchar *
get_extension(const gchar * filename)
{

        }

    return 2 * ch * samples;
}

/*
 * Ok, nhjm449! Are you *happy* now?!  -nenolod
 */
static TitleInput *
get_tuple_for_vorbisfile(OggVorbis_File * vorbisfile, gchar *filename, gboolean is_stream)
{
    TitleInput *tuple = NULL;
    vorbis_comment *comment;
    gchar *realfn = NULL;
    tuple = bmp_title_input_new();

    realfn = g_filename_from_uri(filename, NULL, NULL);
    tuple->file_name = g_path_get_basename(realfn ? realfn : filename);
    tuple->file_ext = get_extension(realfn ? realfn : filename);
    tuple->file_path = g_path_get_dirname(realfn ? realfn : filename);
    g_free(realfn); realfn = NULL;

    /* Retrieve the length */
    if (is_stream == FALSE)
        tuple->length = ov_time_total(vorbisfile, -1) * 1000;
    else
        tuple->length = -1;

    if ((comment = ov_comment(vorbisfile, -1))) {
        tuple->track_name =
            str_to_utf8(vorbis_comment_query(comment, "title", 0));
        tuple->performer =
            str_to_utf8(vorbis_comment_query(comment, "artist", 0));
        tuple->album_name =
            str_to_utf8(vorbis_comment_query(comment, "album", 0));

        if (vorbis_comment_query(comment, "tracknumber", 0) != NULL)
            tuple->track_number =
                atoi(vorbis_comment_query(comment, "tracknumber", 0));

        tuple->date = str_to_utf8(vorbis_comment_query(comment, "date", 0));
        tuple->genre = str_to_utf8(vorbis_comment_query(comment, "genre", 0));
        tuple->comment =
            str_to_utf8(vorbis_comment_query(comment, "comment", 0));

        /* remove any blank tags */
        REMOVE_NONEXISTANT_TAG(tuple->performer);
        REMOVE_NONEXISTANT_TAG(tuple->album_name);
        REMOVE_NONEXISTANT_TAG(tuple->track_name);
        REMOVE_NONEXISTANT_TAG(tuple->genre);
        REMOVE_NONEXISTANT_TAG(tuple->comment);
    }

    return tuple;
}

static TitleInput *
get_song_tuple(gchar *filename)
{
    VFSFile *stream = NULL;
    OggVorbis_File vfile;          /* avoid thread interaction */
    TitleInput *tuple = NULL;
    gboolean is_stream = FALSE;
    VFSVorbisFile *fd = NULL;

    if ((stream = vfs_fopen(filename, "r")) == NULL)
        return NULL;

static gchar *
vorbis_generate_title(OggVorbis_File * vorbisfile, gchar * filename)
{
    /* Caller should hold vf_mutex */
    gchar *displaytitle = NULL;
    TitleInput *input;
    gchar *tmp;

    input = get_tuple_for_vorbisfile(vorbisfile, filename, vorbis_is_streaming);

    if (!(displaytitle = xmms_get_titlestring(vorbis_cfg.tag_override ?
                                              vorbis_cfg.tag_format :
                                              xmms_get_gentitle_format(),
                                              input))) {
        displaytitle = g_strdup(input->file_name);
    }

    if ((tmp = vfs_get_metadata(((VFSVorbisFile *) vorbisfile->datasource)->fd, "stream-name")) != NULL)
    {
        gchar *old = displaytitle;
        displaytitle = g_strdup_printf("%s (%s)", displaytitle, tmp);

	g_free(old);
	g_free(tmp);
    }

    bmp_title_input_free(input);

    return displaytitle;
}

static void
vorbis_aboutbox()
{
    static GtkWidget *about_window;

    if (about_window)
        gdk_window_raise(about_window->window);

1433:d557d987e42d

#include "audacious/plugin.h"
#include "audacious/output.h"
#include "audacious/util.h"
#include "audacious/configdb.h"
#include "audacious/main.h"
#include <audacious/i18n.h>
#include <audacious/strings.h>

#include "vorbis.h"

extern vorbis_config_t vorbis_cfg;

static Tuple *get_song_tuple(gchar *filename);
static int vorbis_check_file(char *filename);
static int vorbis_check_fd(char *filename, VFSFile *stream);
static void vorbis_play(InputPlayback *data);
static void vorbis_stop(InputPlayback *data);
static void vorbis_pause(InputPlayback *data, short p);

}

static void
vorbis_get_song_info(char *filename, char **title, int *length)
{
    Tuple *tuple = get_song_tuple(filename);

    *length = tuple_get_int(tuple, "length");
    *title = tuple_formatter_process_string(tuple, vorbis_cfg.tag_override ?
                                  vorbis_cfg.tag_format : cfg.gentitle_format);

    mowgli_object_unref(tuple);
}

static const gchar *
get_extension(const gchar * filename)
{

        }

    return 2 * ch * samples;
}

static void _tuple_associate_string(Tuple *tuple, const gchar *field, const gchar *string)
{
    gchar *str = str_to_utf8(string);

    tuple_associate_string(tuple, field, str);

    g_free(str);
}

/*
 * Ok, nhjm449! Are you *happy* now?!  -nenolod
 */
static Tuple *
get_tuple_for_vorbisfile(OggVorbis_File * vorbisfile, gchar *filename, gboolean is_stream)
{
    Tuple *tuple = NULL;
    vorbis_comment *comment;
    gchar *realfn = NULL;
    tuple = tuple_new_from_filename(filename);

    /* Retrieve the length */
    if (is_stream == FALSE)
        tuple_associate_int(tuple, "length", ov_time_total(vorbisfile, -1) * 1000);
    else
        tuple_associate_int(tuple, "length", -1);

    if ((comment = ov_comment(vorbisfile, -1))) {
        _tuple_associate_string(tuple, "title", vorbis_comment_query(comment, "title", 0));
        _tuple_associate_string(tuple, "artist", vorbis_comment_query(comment, "artist", 0));
        _tuple_associate_string(tuple, "album", vorbis_comment_query(comment, "album", 0));
        _tuple_associate_string(tuple, "date", vorbis_comment_query(comment, "date", 0));
        _tuple_associate_string(tuple, "genre", vorbis_comment_query(comment, "genre", 0));
        _tuple_associate_string(tuple, "comment", vorbis_comment_query(comment, "comment", 0));

        if (vorbis_comment_query(comment, "tracknumber", 0) != NULL)
            tuple_associate_int(tuple, "track-number", 
                atoi(vorbis_comment_query(comment, "tracknumber", 0)));

        tuple_associate_string(tuple, "quality", "lossy");
        if (comment && comment->vendor)
        {
            gchar *codec = g_strdup_printf("Ogg Vorbis [%s]", comment->vendor);
            tuple_associate_string(tuple, "codec", codec);
            g_free(codec);
        }
        else
            tuple_associate_string(tuple, "codec", "Ogg Vorbis");
    }

    return tuple;
}

static Tuple *
get_song_tuple(gchar *filename)
{
    VFSFile *stream = NULL;
    OggVorbis_File vfile;          /* avoid thread interaction */
    Tuple *tuple = NULL;
    gboolean is_stream = FALSE;
    VFSVorbisFile *fd = NULL;

    if ((stream = vfs_fopen(filename, "r")) == NULL)
        return NULL;

static gchar *
vorbis_generate_title(OggVorbis_File * vorbisfile, gchar * filename)
{
    /* Caller should hold vf_mutex */
    gchar *displaytitle = NULL;
    Tuple *input;
    gchar *tmp;

    input = get_tuple_for_vorbisfile(vorbisfile, filename, vorbis_is_streaming);

    displaytitle = tuple_formatter_process_string(input, vorbis_cfg.tag_override ?
                                              vorbis_cfg.tag_format : cfg.gentitle_format);

    if ((tmp = vfs_get_metadata(((VFSVorbisFile *) vorbisfile->datasource)->fd, "stream-name")) != NULL)
    {
        gchar *old = displaytitle;

        tuple_associate_string(input, "stream", tmp);
        tuple_associate_string(input, "title", old);

        displaytitle = tuple_formatter_process_string(input, "${?title:${title}}${?stream: (${stream})}");

	g_free(old);
	g_free(tmp);
    }

    mowgli_object_unref(input);

    return displaytitle;
}

static void
vorbis_aboutbox(void)
{
    static GtkWidget *about_window;

    if (about_window)
        gdk_window_raise(about_window->window);