Attachment #77459 for bug #119478





AM_PATH_GTK(1.0.1)
AM_PATH_ALSA(1.0.0)

PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.0, have_gtk2=yes, have_gtk2=no)

AC_ARG_ENABLE(gtk2,
[  --enable-gtk2           Enable GTK2 graphical interface (default=yes)],
[if test "$enableval" = "no"
then
have_gtk2=no
fi])

CFLAGS="$CFLAGS $ALSA_FLAGS"
LDFLAGS="$LDFLAGS $ALSA_LIBS"

if test "$have_gtk2" = "yes"
then
        ENVY24CONTROL_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK2_CFLAGS"
        ENVY24CONTROL_LIBS="$LIBS $ALSA_LIBS $LDFLAGS $GTK2_LIBS"
else
        ENVY24CONTROL_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK_CFLAGS"
        ENVY24CONTROL_LIBS="$LIBS $ALSA_LIBS $GTK_LIBS"
fi

AC_SUBST(ENVY24CONTROL_CFLAGS)
AC_SUBST(ENVY24CONTROL_LIBS)
#AC_SUBST(ALSACTL)




	gtk_widget_show(scrolledwindow);
	gtk_box_pack_start(GTK_BOX(hbox), scrolledwindow, TRUE, TRUE, 0);
	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow), 
					GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);

	viewport = gtk_viewport_new(NULL, NULL);
	gtk_widget_show(viewport);

	gtk_widget_show(scrolledwindow);
	gtk_container_add(GTK_CONTAINER(notebook), scrolledwindow);
	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow), 
				       GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);

        label = gtk_label_new("Patchbay / Router");
        gtk_widget_show(label);

				   label);

	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow), 
				       GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
	viewport = gtk_viewport_new(NULL, NULL);
	gtk_widget_show(viewport);
	gtk_container_add(GTK_CONTAINER(scrolledwindow), viewport);

Lines 15-21 Link Here

(-)envy24control/envy24control.h (-1 / +1 lines)
15	#endif	15	#endif
16	#define MAX_PROFILES 8	16	#define MAX_PROFILES 8
17	#define MAX_PROFILE_NAME_LENGTH 20	17	#define MAX_PROFILE_NAME_LENGTH 20
18	#define DEFAULT_PROFILERC "~/envy24control/profiles.conf"	18	#define DEFAULT_PROFILERC "~/.envy24control/profiles.conf"
19	#define SYS_PROFILERC "/etc/envy24control/profiles.conf"	19	#define SYS_PROFILERC "/etc/envy24control/profiles.conf"
20	#ifndef MKDIR	20	#ifndef MKDIR
21	#define MKDIR "/bin/mkdir"	21	#define MKDIR "/bin/mkdir"

Return to bug 119478

Lines 357-363 static void create_mixer(GtkWidget *main Link Here

(-)envy24control/envy24control.c (-3 / +3 lines)
357	gtk_widget_show(scrolledwindow);	357	gtk_widget_show(scrolledwindow);
358	gtk_box_pack_start(GTK_BOX(hbox), scrolledwindow, TRUE, TRUE, 0);	358	gtk_box_pack_start(GTK_BOX(hbox), scrolledwindow, TRUE, TRUE, 0);
359	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow),	359	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow),
360	GTK_POLICY_ALWAYS, GTK_POLICY_NEVER);	360	GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
361		361
362	viewport = gtk_viewport_new(NULL, NULL);	362	viewport = gtk_viewport_new(NULL, NULL);
363	gtk_widget_show(viewport);	363	gtk_widget_show(viewport);
Lines 529-535 static void create_router(GtkWidget *mai Link Here
529	gtk_widget_show(scrolledwindow);	529	gtk_widget_show(scrolledwindow);
530	gtk_container_add(GTK_CONTAINER(notebook), scrolledwindow);	530	gtk_container_add(GTK_CONTAINER(notebook), scrolledwindow);
531	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow),	531	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow),
532	GTK_POLICY_ALWAYS, GTK_POLICY_NEVER);	532	GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
533		533
534	label = gtk_label_new("Patchbay / Router");	534	label = gtk_label_new("Patchbay / Router");
535	gtk_widget_show(label);	535	gtk_widget_show(label);
Lines 1445-1451 static void create_analog_volume(GtkWidg Link Here
1445	label);	1445	label);
1446		1446
1447	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow),	1447	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow),
1448	GTK_POLICY_ALWAYS, GTK_POLICY_NEVER);	1448	GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
1449	viewport = gtk_viewport_new(NULL, NULL);	1449	viewport = gtk_viewport_new(NULL, NULL);
1450	gtk_widget_show(viewport);	1450	gtk_widget_show(viewport);
1451	gtk_container_add(GTK_CONTAINER(scrolledwindow), viewport);	1451	gtk_container_add(GTK_CONTAINER(scrolledwindow), viewport);

Lines 6-13 AC_HEADER_STDC Link Here

(-)alsa-tools/envy24control/configure.in (-2 / +22 lines)
6		6
7	AM_PATH_GTK(1.0.1)	7	AM_PATH_GTK(1.0.1)
8	AM_PATH_ALSA(1.0.0)	8	AM_PATH_ALSA(1.0.0)
9	ENVY24CONTROL_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK_CFLAGS"	9
10	ENVY24CONTROL_LIBS="$LIBS $ALSA_LIBS $GTK_LIBS"	10	PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.0, have_gtk2=yes, have_gtk2=no)
		11
		12	AC_ARG_ENABLE(gtk2,
		13	[ --enable-gtk2 Enable GTK2 graphical interface (default=yes)],
		14	[if test "$enableval" = "no"
		15	then
		16	have_gtk2=no
		17	fi])
		18
		19	CFLAGS="$CFLAGS $ALSA_FLAGS"
		20	LDFLAGS="$LDFLAGS $ALSA_LIBS"
		21
		22	if test "$have_gtk2" = "yes"
		23	then
		24	ENVY24CONTROL_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK2_CFLAGS"
		25	ENVY24CONTROL_LIBS="$LIBS $ALSA_LIBS $LDFLAGS $GTK2_LIBS"
		26	else
		27	ENVY24CONTROL_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK_CFLAGS"
		28	ENVY24CONTROL_LIBS="$LIBS $ALSA_LIBS $GTK_LIBS"
		29	fi
		30
11	AC_SUBST(ENVY24CONTROL_CFLAGS)	31	AC_SUBST(ENVY24CONTROL_CFLAGS)
12	AC_SUBST(ENVY24CONTROL_LIBS)	32	AC_SUBST(ENVY24CONTROL_LIBS)
13	#AC_SUBST(ALSACTL)	33	#AC_SUBST(ALSACTL)