Gentoo Attachment #40319 for bug #65098

View | Details | Raw Unified
Collapse All | Expand All

(-) jamin-0.9.0.orig/configure.in (-3 / +5 lines)

Lines 1-7	Link Here

dnl Process this file with autoconf to produce a configure script.

dnl Process this file with autoconf to produce a configure script.

AC_INIT(configure.in)

AC_INIT(configure.in)

AM_INIT_AUTOMAKE(jamin, 0.9.0)

AM_INIT_AUTOMAKE(jamin, 0.9.03)

AM_CONFIG_HEADER(config.h)

AM_CONFIG_HEADER(config.h)

AM_MAINTAINER_MODE

AM_MAINTAINER_MODE

Lines 32-42	Link Here

	[AC_DEFINE(HAVE_POSIX_SCHED,,[POSIX scheduler support])])

	[AC_DEFINE(HAVE_POSIX_SCHED,,[POSIX scheduler support])])

PKG_CHECK_MODULES(JACK, jack >= 0.80.0)

PKG_CHECK_MODULES(JACK, jack >= 0.80.0)

AC_CHECK_LIB(jack,jack_create_thread,

	[AC_DEFINE(HAVE_JACK_CREATE_THREAD,,[JACK supports thread creation])])

AC_CHECK_LIB(jack,jack_ringbuffer_create,

AC_CHECK_LIB(jack,jack_ringbuffer_create,

	[AC_DEFINE(HAVE_JACK_RINGBUFFER,,[JACK has ringbuffer support])],)

	[AC_DEFINE(HAVE_JACK_RINGBUFFER,,[JACK has ringbuffer support])])

AC_CHECK_LIB(jack,jack_client_name_size,

AC_CHECK_LIB(jack,jack_client_name_size,

	[AC_DEFINE(HAVE_JACK_CLIENT_NAME_SIZE,,

	[AC_DEFINE(HAVE_JACK_CLIENT_NAME_SIZE,,

		[JACK returns client name size])],)

		[JACK returns client name size])])

[if test "${enable_double_fft+set}" = set; then]

[if test "${enable_double_fft+set}" = set; then]

	PKG_CHECK_MODULES(FFTW, fftw3 >= 3.0, AC_DEFINE(FFTW_TYPE, [double], [Datatype used by installed FFTW libraries]), [AC_MSG_ERROR([Didn't find any double precision FFTW3 libraries])])

	PKG_CHECK_MODULES(FFTW, fftw3 >= 3.0, AC_DEFINE(FFTW_TYPE, [double], [Datatype used by installed FFTW libraries]), [AC_MSG_ERROR([Didn't find any double precision FFTW3 libraries])])

(-) jamin-0.9.0.orig/src/compressor-ui.c (-62 / +13 lines)

Lines 11-17	Link Here

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *  GNU General Public License for more details.

 *  GNU General Public License for more details.

 *  $Id: compressor-ui.c,v 1.27 2004/06/28 22:59:48 jdepner Exp $

 *  $Id: compressor-ui.c,v 1.28 2004/09/08 13:44:03 jdepner Exp $

*/

*/

#include <stdio.h>

#include <stdio.h>

Lines 139-151	Link Here

	ma[i] = scale;

	ma[i] = scale;

	auto_gain[i] = 0;

	auto_gain[i] = 0;

        prev_value_at[i] = -1.0;

        prev_value_re[i] = -1.0;

        prev_value_th[i] = 1.0;

        prev_value_ra[i] = -1.0;

        prev_value_kn[i] = -1.0;

        prev_value_ma[i] = -1.0;

Lines 166-179	Link Here

  if (!suspend_gang && gang_at[i])

  if (!suspend_gang && gang_at[i])

      if (prev_value_at[i] > 0.0)

      diff = value - prev_value_at[i];

          diff = value - prev_value_at[i];

      else

          diff = 0.0;

      for (j = 0 ; j < XO_BANDS ; j++)

      for (j = 0 ; j < XO_BANDS ; j++)

Lines 213-226	Link Here

  if (!suspend_gang && gang_re[i])

  if (!suspend_gang && gang_re[i])

      if (prev_value_re[i] > 0.0)

      diff = value - prev_value_re[i];

          diff = value - prev_value_re[i];

      else

          diff = 0.0;

      for (j = 0 ; j < XO_BANDS ; j++)

      for (j = 0 ; j < XO_BANDS ; j++)

Lines 260-273	Link Here

  if (!suspend_gang && gang_th[i])

  if (!suspend_gang && gang_th[i])

      if (prev_value_th[i] < 0.0)

      diff = value - prev_value_th[i];

          diff = value - prev_value_th[i];

      else

          diff = 0.0;

      for (j = 0 ; j < XO_BANDS ; j++)

      for (j = 0 ; j < XO_BANDS ; j++)

Lines 317-330	Link Here

  if (!suspend_gang && gang_ra[i])

  if (!suspend_gang && gang_ra[i])

      if (prev_value_ra[i] > 0.0)

      diff = value - prev_value_ra[i];

          diff = value - prev_value_ra[i];

      else

          diff = 0.0;

      for (j = 0 ; j < XO_BANDS ; j++)

      for (j = 0 ; j < XO_BANDS ; j++)

Lines 374-387	Link Here

  if (!suspend_gang && gang_kn[i])

  if (!suspend_gang && gang_kn[i])

      if (prev_value_kn[i] > 0.0)

      diff = value - prev_value_kn[i];

          diff = value - prev_value_kn[i];

      else

          diff = 0.0;

      for (j = 0 ; j < XO_BANDS ; j++)

      for (j = 0 ; j < XO_BANDS ; j++)

Lines 423-436	Link Here

  if (!suspend_gang && gang_ma[i])

  if (!suspend_gang && gang_ma[i])

      if (prev_value_ma[i] > 0.0)

      diff = value - prev_value_ma[i];

          diff = value - prev_value_ma[i];

      else

          diff = 0.0;

      for (j = 0 ; j < XO_BANDS ; j++)

      for (j = 0 ; j < XO_BANDS ; j++)

Lines 581-587	Link Here

      gang_at[band] = FALSE;

      gang_at[band] = FALSE;

      gtk_widget_modify_fg ((GtkWidget *) lab_at[band], GTK_STATE_NORMAL,

      gtk_widget_modify_fg ((GtkWidget *) lab_at[band], GTK_STATE_NORMAL,

                            get_color (TEXT_COLOR));

                            get_color (TEXT_COLOR));

      prev_value_at[band] = -1.0;

      prev_value_at[band] = gtk_adjustment_get_value (adj_at[band]);

  else

  else

Lines 598-604	Link Here

      gang_re[band] = FALSE;

      gang_re[band] = FALSE;

      gtk_widget_modify_fg ((GtkWidget *) lab_re[band], GTK_STATE_NORMAL,

      gtk_widget_modify_fg ((GtkWidget *) lab_re[band], GTK_STATE_NORMAL,

                            get_color (TEXT_COLOR));

                            get_color (TEXT_COLOR));

      prev_value_re[band] = -1.0;

      prev_value_re[band] = gtk_adjustment_get_value (adj_re[band]);

  else

  else

Lines 615-621	Link Here

      gang_th[band] = FALSE;

      gang_th[band] = FALSE;

      gtk_widget_modify_fg ((GtkWidget *) lab_th[band], GTK_STATE_NORMAL,

      gtk_widget_modify_fg ((GtkWidget *) lab_th[band], GTK_STATE_NORMAL,

                            get_color (TEXT_COLOR));

                            get_color (TEXT_COLOR));

      prev_value_th[band] = 1.0;

      prev_value_th[band] = gtk_adjustment_get_value (adj_th[band]);

  else

  else

Lines 632-638	Link Here

      gang_ra[band] = FALSE;

      gang_ra[band] = FALSE;

      gtk_widget_modify_fg ((GtkWidget *) lab_ra[band], GTK_STATE_NORMAL,

      gtk_widget_modify_fg ((GtkWidget *) lab_ra[band], GTK_STATE_NORMAL,

                            get_color (TEXT_COLOR));

                            get_color (TEXT_COLOR));

      prev_value_ra[band] = -1.0;

      prev_value_ra[band] = gtk_adjustment_get_value (adj_ra[band]);

  else

  else

Lines 648-654	Link Here

      gang_kn[band] = FALSE;

      gang_kn[band] = FALSE;

      gtk_widget_modify_fg ((GtkWidget *) lab_kn[band], GTK_STATE_NORMAL,

      gtk_widget_modify_fg ((GtkWidget *) lab_kn[band], GTK_STATE_NORMAL,

                            get_color (TEXT_COLOR));

                            get_color (TEXT_COLOR));

      prev_value_kn[band] = -1.0;

      prev_value_kn[band] = gtk_adjustment_get_value (adj_kn[band]);

  else

  else

Lines 665-671	Link Here

      gang_ma[band] = FALSE;

      gang_ma[band] = FALSE;

      gtk_widget_modify_fg ((GtkWidget *) lab_ma[band], GTK_STATE_NORMAL,

      gtk_widget_modify_fg ((GtkWidget *) lab_ma[band], GTK_STATE_NORMAL,

                            get_color (TEXT_COLOR));

                            get_color (TEXT_COLOR));

      prev_value_ma[band] = -1.0;

      prev_value_ma[band] = gtk_adjustment_get_value (adj_ma[band]);

  else

  else

(-) jamin-0.9.0.orig/src/geq.c (-3 / +3 lines)

Lines 11-17	Link Here

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *  GNU General Public License for more details.

 *  GNU General Public License for more details.

 *  $Id: geq.c,v 1.31 2004/05/08 21:29:39 jdepner Exp $

 *  $Id: geq.c,v 1.32 2004/08/20 22:56:08 jdepner Exp $

*/

*/

/* code to control the graphic eq's, swh */

/* code to control the graphic eq's, swh */

Lines 122-128	Link Here

    int i, bin;

    int i, bin;

    if (length != BINS / 2 - 1)

    if (length < BINS / 2 - 1)

        errstr =

        errstr =

          g_strdup_printf (_("Splined length %d does not match BINS / 2 - 1 (%d)"),

          g_strdup_printf (_("Splined length %d does not match BINS / 2 - 1 (%d)"),

Lines 155-161	Link Here

    float value;

    float value;

    if (length != BINS / 2 - 1)

    if (length < BINS / 2 - 1)

        errstr = g_strdup_printf (_("Splined length %d does not match BINS / 2 - 1 (%d)"),

        errstr = g_strdup_printf (_("Splined length %d does not match BINS / 2 - 1 (%d)"),

                                  length, BINS / 2 - 1);

                                  length, BINS / 2 - 1);

(-) jamin-0.9.0.orig/src/io.c (-6 / +31 lines)

Lines 1-7	Link Here

/*

/*

 *  io.c -- JAMin I/O driver.

 *  io.c -- JAMin I/O driver.

 *  Copyright (C) 2003 Jack O'Quin.

 *  Copyright (C) 2003, 2004 Jack O'Quin.

 *  This program is free software; you can redistribute it and/or modify

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by

 *  it under the terms of the GNU General Public License as published by

Lines 58-63	Link Here

 *	+ JACK not running realtime

 *	+ JACK not running realtime

*/

*/

#include "config.h"

#include <stdio.h>

#include <stdio.h>

#include <stdarg.h>

#include <stdarg.h>

#include <stdlib.h>

#include <stdlib.h>

Lines 71-78	Link Here

#include <errno.h>

#include <errno.h>

#include <assert.h>

#include <assert.h>

#include <jack/jack.h>

#include <jack/jack.h>

#ifdef HAVE_JACK_CREATE_THREAD

#include <jack/thread.h>

#endif

#include "config.h"

#include "ringbuffer.h"		/* uses <jack/ringbuffer.h>, if available */

#include "ringbuffer.h"		/* uses <jack/ringbuffer.h>, if available */

#include "process.h"

#include "process.h"

#include "resource.h"

#include "resource.h"

Lines 857-865	Link Here

    int rc;

    int rc;

    int policy;

    int policy;

    struct sched_param rt_param, my_param;

    struct sched_param rt_param;

    pthread_attr_t attributes;

    pthread_attr_t attributes;

    pthread_attr_init(&attributes);

    pthread_attr_init(&attributes);

#ifndef HAVE_JACK_CREATE_THREAD

    struct sched_param my_param;

#endif

    /* Set priority and scheduling parameters based on the attributes

    /* Set priority and scheduling parameters based on the attributes

     * of the JACK client thread. */

     * of the JACK client thread. */

Lines 884-889	Link Here

    } else

    } else

	IF_DEBUG(DBG_TERSE, io_trace("JACK subsystem not realtime"));

	IF_DEBUG(DBG_TERSE, io_trace("JACK subsystem not realtime"));

#ifdef HAVE_JACK_CREATE_THREAD

    rc = jack_create_thread(&dsp_thread, rt_param.sched_priority,

			    jst.realtime, io_dsp_thread, NULL);

    switch (rc) {

    case 0:

	IF_DEBUG(DBG_TERSE, io_trace("DSP thread created"));

	break;

    case EPERM:

	io_errlog(EPERM, "no realtime privileges for DSP thread");

	break;

    default:

	io_errlog(rc, "error creating DSP thread");

#else  /* !HAVE_JACK_CREATE_THREAD */

    rc = pthread_attr_setschedpolicy(&attributes, policy);

    rc = pthread_attr_setschedpolicy(&attributes, policy);

    if (rc) {

    if (rc) {

	io_errlog(EPERM, "cannot set scheduling policy, rc = %d.", rc);

	io_errlog(EPERM, "cannot set scheduling policy, rc = %d.", rc);

Lines 984-993	Link Here

    /* return this thread to the scheduler it used before */

    /* return this thread to the scheduler it used before */

    sched_setscheduler(0, policy, &my_param);

    sched_setscheduler(0, policy, &my_param);

    IF_DEBUG(DBG_TERSE, io_trace("DSP thread finally created"));

    IF_DEBUG(DBG_TERSE, io_trace("DSP thread finally created"));

    return 0;

    rc = 0;

#else /* !HAVE_POSIX_SCHED */

    return rc;

#endif /* HAVE_POSIX_SCHED */

#endif /* HAVE_POSIX_SCHED */

#endif /* HAVE_JACK_CREATE_THREAD */

    return rc;

(-) jamin-0.9.0.orig/src/scenes.c (-4 / +1 lines)

Lines 60-68	Link Here

                         *LED_yellow = NULL, *LED_red = NULL;

                         *LED_yellow = NULL, *LED_red = NULL;

void set_EQ_curve_values ();

/*  Initialize all scene related structures and get the widget addresses.  */

/*  Initialize all scene related structures and get the widget addresses.  */

void bind_scenes ()

void bind_scenes ()

Lines 210-216	Link Here

                        s_crossfade_to_state (&scene_state[i], -1.0f);

                        s_crossfade_to_state (&scene_state[i], -1.0f);

                        set_EQ_curve_values ();

                        set_EQ_curve_values (0, 0.0);

                        s_history_add_state (scene_state[i]);

                        s_history_add_state (scene_state[i]);

Attachment #40319: Jamin patch for Jack 0.99 for bug #65098