Attachment #40747 for bug #65098

Lines 1-7 Link Here

(-)jamin-0.9.0.orig/configure.in (-3 / +5 lines)
1	dnl Process this file with autoconf to produce a configure script.	1	dnl Process this file with autoconf to produce a configure script.
2		2
3	AC_INIT(configure.in)	3	AC_INIT(configure.in)
4	AM_INIT_AUTOMAKE(jamin, 0.9.0)	4	AM_INIT_AUTOMAKE(jamin, 0.9.03)
5	AM_CONFIG_HEADER(config.h)	5	AM_CONFIG_HEADER(config.h)
6	AM_MAINTAINER_MODE	6	AM_MAINTAINER_MODE
7		7
Lines 32-42 Link Here
32	[AC_DEFINE(HAVE_POSIX_SCHED,,[POSIX scheduler support])])	32	[AC_DEFINE(HAVE_POSIX_SCHED,,[POSIX scheduler support])])
33		33
34	PKG_CHECK_MODULES(JACK, jack >= 0.80.0)	34	PKG_CHECK_MODULES(JACK, jack >= 0.80.0)
		35	AC_CHECK_LIB(jack,jack_create_thread,
		36	[AC_DEFINE(HAVE_JACK_CREATE_THREAD,,[JACK supports thread creation])])
35	AC_CHECK_LIB(jack,jack_ringbuffer_create,	37	AC_CHECK_LIB(jack,jack_ringbuffer_create,
36	[AC_DEFINE(HAVE_JACK_RINGBUFFER,,[JACK has ringbuffer support])],)	38	[AC_DEFINE(HAVE_JACK_RINGBUFFER,,[JACK has ringbuffer support])])
37	AC_CHECK_LIB(jack,jack_client_name_size,	39	AC_CHECK_LIB(jack,jack_client_name_size,
38	[AC_DEFINE(HAVE_JACK_CLIENT_NAME_SIZE,,	40	[AC_DEFINE(HAVE_JACK_CLIENT_NAME_SIZE,,
39	[JACK returns client name size])],)	41	[JACK returns client name size])])
40		42
41	[if test "${enable_double_fft+set}" = set; then]	43	[if test "${enable_double_fft+set}" = set; then]
42	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])])	44	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])])




	ma[i] = scale;

	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;
    }
}



  if (!suspend_gang && gang_at[i])
    {
      diff = value - prev_value_at[i];
        {
          diff = value - prev_value_at[i];
        }
      else
        {
          diff = 0.0;
        }

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


  if (!suspend_gang && gang_re[i])
    {
      diff = value - prev_value_re[i];
        {
          diff = value - prev_value_re[i];
        }
      else
        {
          diff = 0.0;
        }

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


  if (!suspend_gang && gang_th[i])
    {
      diff = value - prev_value_th[i];
        {
          diff = value - prev_value_th[i];
        }
      else
        {
          diff = 0.0;
        }

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


  if (!suspend_gang && gang_ra[i])
    {
      diff = value - prev_value_ra[i];
        {
          diff = value - prev_value_ra[i];
        }
      else
        {
          diff = 0.0;
        }

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


  if (!suspend_gang && gang_kn[i])
    {
      diff = value - prev_value_kn[i];
        {
          diff = value - prev_value_kn[i];
        }
      else
        {
          diff = 0.0;
        }

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


  if (!suspend_gang && gang_ma[i])
    {
      diff = value - prev_value_ma[i];
        {
          diff = value - prev_value_ma[i];
        }
      else
        {
          diff = 0.0;
        }

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

      gang_at[band] = FALSE;
      gtk_widget_modify_fg ((GtkWidget *) lab_at[band], GTK_STATE_NORMAL, 
                            get_color (TEXT_COLOR));
      prev_value_at[band] = gtk_adjustment_get_value (adj_at[band]);
    }
  else
    {

      gang_re[band] = FALSE;
      gtk_widget_modify_fg ((GtkWidget *) lab_re[band], GTK_STATE_NORMAL, 
                            get_color (TEXT_COLOR));
      prev_value_re[band] = gtk_adjustment_get_value (adj_re[band]);
    }
  else
    {

      gang_th[band] = FALSE;
      gtk_widget_modify_fg ((GtkWidget *) lab_th[band], GTK_STATE_NORMAL, 
                            get_color (TEXT_COLOR));
      prev_value_th[band] = gtk_adjustment_get_value (adj_th[band]);
    }
  else
    {

      gang_ra[band] = FALSE;
      gtk_widget_modify_fg ((GtkWidget *) lab_ra[band], GTK_STATE_NORMAL, 
                            get_color (TEXT_COLOR));
      prev_value_ra[band] = gtk_adjustment_get_value (adj_ra[band]);
    }
  else
    {

      gang_kn[band] = FALSE;
      gtk_widget_modify_fg ((GtkWidget *) lab_kn[band], GTK_STATE_NORMAL, 
                            get_color (TEXT_COLOR));
      prev_value_kn[band] = gtk_adjustment_get_value (adj_kn[band]);
    }
  else
    {

      gang_ma[band] = FALSE;
      gtk_widget_modify_fg ((GtkWidget *) lab_ma[band], GTK_STATE_NORMAL, 
                            get_color (TEXT_COLOR));
      prev_value_ma[band] = gtk_adjustment_get_value (adj_ma[band]);
    }
  else
    {

Lines 122-128 Link Here

(-)jamin-0.9.0.orig/src/geq.c (-2 / +2 lines)
122	int i, bin;	122	int i, bin;
123		123
124		124
125	if (length != BINS / 2 - 1)	125	if (length < BINS / 2 - 1)
126	{	126	{
127	errstr =	127	errstr =
128	g_strdup_printf (_("Splined length %d does not match BINS / 2 - 1 (%d)"),	128	g_strdup_printf (_("Splined length %d does not match BINS / 2 - 1 (%d)"),
Lines 155-161 Link Here
155	float value;	155	float value;
156		156
157		157
158	if (length != BINS / 2 - 1)	158	if (length < BINS / 2 - 1)
159	{	159	{
160	errstr = g_strdup_printf (_("Splined length %d does not match BINS / 2 - 1 (%d)"),	160	errstr = g_strdup_printf (_("Splined length %d does not match BINS / 2 - 1 (%d)"),
161	length, BINS / 2 - 1);	161	length, BINS / 2 - 1);

Lines 58-63 Link Here

(-)jamin-0.9.0.orig/src/io.c (-5 / +30 lines)
58	* + JACK not running realtime	58	* + JACK not running realtime
59	*/	59	*/
60		60
		61	#include "config.h"
		62
61	#include <stdio.h>	63	#include <stdio.h>
62	#include <stdarg.h>	64	#include <stdarg.h>
63	#include <stdlib.h>	65	#include <stdlib.h>
Lines 71-78 Link Here
71	#include <errno.h>	73	#include <errno.h>
72	#include <assert.h>	74	#include <assert.h>
73	#include <jack/jack.h>	75	#include <jack/jack.h>
		76	#ifdef HAVE_JACK_CREATE_THREAD
		77	#include <jack/thread.h>
		78	#endif
74		79
75	#include "config.h"
76	#include "ringbuffer.h" /* uses <jack/ringbuffer.h>, if available */	80	#include "ringbuffer.h" /* uses <jack/ringbuffer.h>, if available */
77	#include "process.h"	81	#include "process.h"
78	#include "resource.h"	82	#include "resource.h"
Lines 857-865 Link Here
857	{	861	{
858	int rc;	862	int rc;
859	int policy;	863	int policy;
860	struct sched_param rt_param, my_param;	864	struct sched_param rt_param;
861	pthread_attr_t attributes;	865	pthread_attr_t attributes;
862	pthread_attr_init(&attributes);	866	pthread_attr_init(&attributes);
		867	#ifndef HAVE_JACK_CREATE_THREAD
		868	struct sched_param my_param;
		869	#endif
863		870
864	/* Set priority and scheduling parameters based on the attributes	871	/* Set priority and scheduling parameters based on the attributes
865	* of the JACK client thread. */	872	* of the JACK client thread. */
Lines 884-889 Link Here
884	} else	891	} else
885	IF_DEBUG(DBG_TERSE, io_trace("JACK subsystem not realtime"));	892	IF_DEBUG(DBG_TERSE, io_trace("JACK subsystem not realtime"));
886		893
		894	#ifdef HAVE_JACK_CREATE_THREAD
		895
		896	rc = jack_create_thread(&dsp_thread, rt_param.sched_priority,
		897	jst.realtime, io_dsp_thread, NULL);
		898	switch (rc) {
		899	case 0:
		900	IF_DEBUG(DBG_TERSE, io_trace("DSP thread created"));
		901	break;
		902	case EPERM:
		903	io_errlog(EPERM, "no realtime privileges for DSP thread");
		904	break;
		905	default:
		906	io_errlog(rc, "error creating DSP thread");
		907	}
		908
		909	#else /* !HAVE_JACK_CREATE_THREAD */
		910
887	rc = pthread_attr_setschedpolicy(&attributes, policy);	911	rc = pthread_attr_setschedpolicy(&attributes, policy);
888	if (rc) {	912	if (rc) {
889	io_errlog(EPERM, "cannot set scheduling policy, rc = %d.", rc);	913	io_errlog(EPERM, "cannot set scheduling policy, rc = %d.", rc);
Lines 984-993 Link Here
984	/* return this thread to the scheduler it used before */	1008	/* return this thread to the scheduler it used before */
985	sched_setscheduler(0, policy, &my_param);	1009	sched_setscheduler(0, policy, &my_param);
986	IF_DEBUG(DBG_TERSE, io_trace("DSP thread finally created"));	1010	IF_DEBUG(DBG_TERSE, io_trace("DSP thread finally created"));
987	return 0;	1011	rc = 0;
988	#else /* !HAVE_POSIX_SCHED */
989	return rc;
990	#endif /* HAVE_POSIX_SCHED */	1012	#endif /* HAVE_POSIX_SCHED */
		1013	#endif /* HAVE_JACK_CREATE_THREAD */
		1014
		1015	return rc;
991	}	1016	}
992		1017




                         *LED_yellow = NULL, *LED_red = NULL;


void set_EQ_curve_values ();


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

void bind_scenes ()


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

                        set_EQ_curve_values (0, 0.0);

                        s_history_add_state (scene_state[i]);


Return to bug 65098

Lines 139-151 Link Here

(-)jamin-0.9.0.orig/src/compressor-ui.c (-61 / +12 lines)
139	ma[i] = scale;	139	ma[i] = scale;
140		140
141	auto_gain[i] = 0;	141	auto_gain[i] = 0;
142
143	prev_value_at[i] = -1.0;
144	prev_value_re[i] = -1.0;
145	prev_value_th[i] = 1.0;
146	prev_value_ra[i] = -1.0;
147	prev_value_kn[i] = -1.0;
148	prev_value_ma[i] = -1.0;
149	}	142	}
150	}	143	}
151		144
Lines 166-179 Link Here
166		159
167	if (!suspend_gang && gang_at[i])	160	if (!suspend_gang && gang_at[i])
168	{	161	{
169	if (prev_value_at[i] > 0.0)	162	diff = value - prev_value_at[i];
170	{
171	diff = value - prev_value_at[i];
172	}
173	else
174	{
175	diff = 0.0;
176	}
177		163
178	for (j = 0 ; j < XO_BANDS ; j++)	164	for (j = 0 ; j < XO_BANDS ; j++)
179	{	165	{
Lines 213-226 Link Here
213		199
214	if (!suspend_gang && gang_re[i])	200	if (!suspend_gang && gang_re[i])
215	{	201	{
216	if (prev_value_re[i] > 0.0)	202	diff = value - prev_value_re[i];
217	{
218	diff = value - prev_value_re[i];
219	}
220	else
221	{
222	diff = 0.0;
223	}
224		203
225	for (j = 0 ; j < XO_BANDS ; j++)	204	for (j = 0 ; j < XO_BANDS ; j++)
226	{	205	{
Lines 260-273 Link Here
260		239
261	if (!suspend_gang && gang_th[i])	240	if (!suspend_gang && gang_th[i])
262	{	241	{
263	if (prev_value_th[i] < 0.0)	242	diff = value - prev_value_th[i];
264	{
265	diff = value - prev_value_th[i];
266	}
267	else
268	{
269	diff = 0.0;
270	}
271		243
272	for (j = 0 ; j < XO_BANDS ; j++)	244	for (j = 0 ; j < XO_BANDS ; j++)
273	{	245	{
Lines 317-330 Link Here
317		289
318	if (!suspend_gang && gang_ra[i])	290	if (!suspend_gang && gang_ra[i])
319	{	291	{
320	if (prev_value_ra[i] > 0.0)	292	diff = value - prev_value_ra[i];
321	{
322	diff = value - prev_value_ra[i];
323	}
324	else
325	{
326	diff = 0.0;
327	}
328		293
329	for (j = 0 ; j < XO_BANDS ; j++)	294	for (j = 0 ; j < XO_BANDS ; j++)
330	{	295	{
Lines 374-387 Link Here
374		339
375	if (!suspend_gang && gang_kn[i])	340	if (!suspend_gang && gang_kn[i])
376	{	341	{
377	if (prev_value_kn[i] > 0.0)	342	diff = value - prev_value_kn[i];
378	{
379	diff = value - prev_value_kn[i];
380	}
381	else
382	{
383	diff = 0.0;
384	}
385		343
386	for (j = 0 ; j < XO_BANDS ; j++)	344	for (j = 0 ; j < XO_BANDS ; j++)
387	{	345	{
Lines 423-436 Link Here
423		381
424	if (!suspend_gang && gang_ma[i])	382	if (!suspend_gang && gang_ma[i])
425	{	383	{
426	if (prev_value_ma[i] > 0.0)	384	diff = value - prev_value_ma[i];
427	{
428	diff = value - prev_value_ma[i];
429	}
430	else
431	{
432	diff = 0.0;
433	}
434		385
435	for (j = 0 ; j < XO_BANDS ; j++)	386	for (j = 0 ; j < XO_BANDS ; j++)
436	{	387	{
Lines 581-587 Link Here
581	gang_at[band] = FALSE;	532	gang_at[band] = FALSE;
582	gtk_widget_modify_fg ((GtkWidget *) lab_at[band], GTK_STATE_NORMAL,	533	gtk_widget_modify_fg ((GtkWidget *) lab_at[band], GTK_STATE_NORMAL,
583	get_color (TEXT_COLOR));	534	get_color (TEXT_COLOR));
584	prev_value_at[band] = -1.0;	535	prev_value_at[band] = gtk_adjustment_get_value (adj_at[band]);
585	}	536	}
586	else	537	else
587	{	538	{
Lines 598-604 Link Here
598	gang_re[band] = FALSE;	549	gang_re[band] = FALSE;
599	gtk_widget_modify_fg ((GtkWidget *) lab_re[band], GTK_STATE_NORMAL,	550	gtk_widget_modify_fg ((GtkWidget *) lab_re[band], GTK_STATE_NORMAL,
600	get_color (TEXT_COLOR));	551	get_color (TEXT_COLOR));
601	prev_value_re[band] = -1.0;	552	prev_value_re[band] = gtk_adjustment_get_value (adj_re[band]);
602	}	553	}
603	else	554	else
604	{	555	{
Lines 615-621 Link Here
615	gang_th[band] = FALSE;	566	gang_th[band] = FALSE;
616	gtk_widget_modify_fg ((GtkWidget *) lab_th[band], GTK_STATE_NORMAL,	567	gtk_widget_modify_fg ((GtkWidget *) lab_th[band], GTK_STATE_NORMAL,
617	get_color (TEXT_COLOR));	568	get_color (TEXT_COLOR));
618	prev_value_th[band] = 1.0;	569	prev_value_th[band] = gtk_adjustment_get_value (adj_th[band]);
619	}	570	}
620	else	571	else
621	{	572	{
Lines 632-638 Link Here
632	gang_ra[band] = FALSE;	583	gang_ra[band] = FALSE;
633	gtk_widget_modify_fg ((GtkWidget *) lab_ra[band], GTK_STATE_NORMAL,	584	gtk_widget_modify_fg ((GtkWidget *) lab_ra[band], GTK_STATE_NORMAL,
634	get_color (TEXT_COLOR));	585	get_color (TEXT_COLOR));
635	prev_value_ra[band] = -1.0;	586	prev_value_ra[band] = gtk_adjustment_get_value (adj_ra[band]);
636	}	587	}
637	else	588	else
638	{	589	{
Lines 648-654 Link Here
648	gang_kn[band] = FALSE;	599	gang_kn[band] = FALSE;
649	gtk_widget_modify_fg ((GtkWidget *) lab_kn[band], GTK_STATE_NORMAL,	600	gtk_widget_modify_fg ((GtkWidget *) lab_kn[band], GTK_STATE_NORMAL,
650	get_color (TEXT_COLOR));	601	get_color (TEXT_COLOR));
651	prev_value_kn[band] = -1.0;	602	prev_value_kn[band] = gtk_adjustment_get_value (adj_kn[band]);
652	}	603	}
653	else	604	else
654	{	605	{
Lines 665-671 Link Here
665	gang_ma[band] = FALSE;	616	gang_ma[band] = FALSE;
666	gtk_widget_modify_fg ((GtkWidget *) lab_ma[band], GTK_STATE_NORMAL,	617	gtk_widget_modify_fg ((GtkWidget *) lab_ma[band], GTK_STATE_NORMAL,
667	get_color (TEXT_COLOR));	618	get_color (TEXT_COLOR));
668	prev_value_ma[band] = -1.0;	619	prev_value_ma[band] = gtk_adjustment_get_value (adj_ma[band]);
669	}	620	}
670	else	621	else
671	{	622	{

Lines 60-68 Link Here

(-)jamin-0.9.0.orig/src/scenes.c (-4 / +1 lines)
60	LED_yellow = NULL, LED_red = NULL;	60	LED_yellow = NULL, LED_red = NULL;
61		61
62		62
63	void set_EQ_curve_values ();
64
65
66	/* Initialize all scene related structures and get the widget addresses. */	63	/* Initialize all scene related structures and get the widget addresses. */
67		64
68	void bind_scenes ()	65	void bind_scenes ()
Lines 210-216 Link Here
210		207
211	s_crossfade_to_state (&scene_state[i], -1.0f);	208	s_crossfade_to_state (&scene_state[i], -1.0f);
212		209
213	set_EQ_curve_values ();	210	set_EQ_curve_values (0, 0.0);
214		211
215	s_history_add_state (scene_state[i]);	212	s_history_add_state (scene_state[i]);
216		213