comparison src/lame/out_lame.c @ 858:9429121d61ec trunk

[svn] - implement real buffer_free() and buffer_playing(). - remove unused code. - apply cast to (short *) in lame_encode_xx() - change version number from 0.2d6 to 0.2.

857:bad7c89d7ba0

#include <audacious/util.h>

#include <lame/lame.h>

#define ENCBUFFER_SIZE 35000
#define OUT_LAME_VER "0.2d6"
#define DEBUG 1
#undef DEBUG

GtkWidget *configure_win = NULL, *path_vbox;
GtkWidget *path_hbox, *path_label, *path_entry, *path_browse,
    *path_dirbrowser = NULL;
GtkWidget *configure_separator;

static gint outlame_open(AFormat fmt, gint rate, gint nch);
static void outlame_write(void *ptr, gint length);
static void outlame_close(void);
static void outlame_flush(gint time);
static void outlame_pause(short p);
static gint outlame_free(void);
static gint outlame_playing(void);
static gint outlame_get_written_time(void);
static gint outlame_get_output_time(void);
static void outlame_configure(void);

lame_global_flags *gfp;

    outlame_open,
    outlame_write,
    outlame_close,
    outlame_flush,
    outlame_pause,
    outlame_free,
    outlame_playing,
    outlame_get_output_time,
    outlame_get_written_time,
    NULL
};

    gchar *filename, *title = NULL, *temp;
    gint pos;
    int b_use_path_anyway = 0;
    gchar *tmpfilename = NULL;
    gchar *tmp = NULL;

    /* store open paramators for reopen */
    oldfmt = fmt; oldrate = rate; oldnch = nch;

    /* So all the values will be reset to the ones saved */

    }
    printf("file_path = %s\n", file_path);
    printf("anyway = %d\n", b_use_path_anyway);
#endif

//    if (tuple && b_use_source_file_path == 1 && b_use_path_anyway == 0) {
    if (tuple && !b_use_path_anyway) {
        if (b_prepend_track_number && tuple->track_number) {
            filename = g_strdup_printf("%s/%.02d %s.mp3",
                                       b_use_source_file_path ? tuple->file_path : file_path,
                                       tuple->track_number, title);

static void outlame_write(void *ptr, gint length)
{

    if (inch == 1) {
        encout =
            lame_encode_buffer(gfp, ptr, ptr, length / 2, encbuffer,
                               ENCBUFFER_SIZE);
    }
    else {
        encout =
            lame_encode_buffer_interleaved(gfp, ptr, length / 4, encbuffer,
                                           ENCBUFFER_SIZE);
    }
    fwrite(encbuffer, 1, encout, output_file);
    written += encout;
    olen += length;

static void outlame_pause(short p)
{
}

static gint outlame_free(void)
{
    return 1000000;
}

static gint outlame_playing(void)
{
    return 0;
}

static gint outlame_get_written_time(void)
{
    gint time;

            inside = 0;
        }
    }

}

static void path_dirbrowser_cb(gchar * dir)
{
    gtk_entry_set_text(GTK_ENTRY(path_entry), dir);
}

#if 0
static void path_browse_cb(GtkWidget * w, gpointer data)
{
    if (!path_dirbrowser) {
        path_dirbrowser =
            xmms_create_dir_browser
            ("Select the directory where you want to store the output files:",
             file_path, GTK_SELECTION_SINGLE, path_dirbrowser_cb);
        gtk_signal_connect(GTK_OBJECT(path_dirbrowser), "destroy",
                           GTK_SIGNAL_FUNC(gtk_widget_destroyed),
                           &path_dirbrowser);
        gtk_window_set_transient_for(GTK_WINDOW(path_dirbrowser),
                                     GTK_WINDOW(configure_win));
        gtk_widget_show(path_dirbrowser);
    }
}
#endif

static void use_source_file_path_cb(GtkToggleButton * togglebutton,
                                    gpointer user_data)
{
    if (gtk_toggle_button_get_active

858:9429121d61ec

#include <audacious/util.h>

#include <lame/lame.h>

#define ENCBUFFER_SIZE 35000
#define OUT_LAME_VER "0.2"
/* #define DEBUG 1 */

GtkWidget *configure_win = NULL, *path_vbox;
GtkWidget *path_hbox, *path_label, *path_entry, *path_browse,
    *path_dirbrowser = NULL;
GtkWidget *configure_separator;

static gint outlame_open(AFormat fmt, gint rate, gint nch);
static void outlame_write(void *ptr, gint length);
static void outlame_close(void);
static void outlame_flush(gint time);
static void outlame_pause(short p);
static gint outlame_buffer_free(void);
static gint outlame_buffer_playing(void);
static gint outlame_get_written_time(void);
static gint outlame_get_output_time(void);
static void outlame_configure(void);

lame_global_flags *gfp;

    outlame_open,
    outlame_write,
    outlame_close,
    outlame_flush,
    outlame_pause,
    outlame_buffer_free,
    outlame_buffer_playing,
    outlame_get_output_time,
    outlame_get_written_time,
    NULL
};

    gchar *filename, *title = NULL, *temp;
    gint pos;
    int b_use_path_anyway = 0;
    gchar *tmpfilename = NULL;

    /* store open paramators for reopen */
    oldfmt = fmt; oldrate = rate; oldnch = nch;

    /* So all the values will be reset to the ones saved */

    }
    printf("file_path = %s\n", file_path);
    printf("anyway = %d\n", b_use_path_anyway);
#endif

    if (tuple && !b_use_path_anyway) {
        if (b_prepend_track_number && tuple->track_number) {
            filename = g_strdup_printf("%s/%.02d %s.mp3",
                                       b_use_source_file_path ? tuple->file_path : file_path,
                                       tuple->track_number, title);

static void outlame_write(void *ptr, gint length)
{

    if (inch == 1) {
        encout =
            lame_encode_buffer(gfp, (short *)ptr, (short *)ptr, length / 2, encbuffer,
                               ENCBUFFER_SIZE);
    }
    else {
        encout =
            lame_encode_buffer_interleaved(gfp, (short *)ptr, length / 4, encbuffer,
                                           ENCBUFFER_SIZE);
    }
    fwrite(encbuffer, 1, encout, output_file);
    written += encout;
    olen += length;

static void outlame_pause(short p)
{
}

static gint outlame_buffer_free(void)
{
    return ENCBUFFER_SIZE - encout;
}

static gint outlame_buffer_playing(void)
{
#ifdef DEBUG    
    printf("lame: buffer_playing = %d\n", encout ? 1 : 0);
#endif
    return encout ? 1 : 0;
}

static gint outlame_get_written_time(void)
{
    gint time;

            inside = 0;
        }
    }

}

static void use_source_file_path_cb(GtkToggleButton * togglebutton,
                                    gpointer user_data)
{
    if (gtk_toggle_button_get_active