Attachment #25583 for bug #41543




    AC_DEFINE(LEGACY_RATINGS,, [Legacy ratings in ID3 tags support])
fi

AC_CHECK_PROG(have_beep_config, beep-config, "yes", "no")
if test "$have_beep_config" = "no"; then
    AC_MSG_ERROR([beep-config required and missing.])
else
    CPPFLAGS=`beep-config --cflags`
fi

AC_CHECK_HEADERS(bmp/plugin.h,, [with_beep=no])
AC_CHECK_HEADERS(beep/beepctrl.h,, [with_beep=no])
if test "$with_beep" = "no"; then
    AC_MSG_ERROR([beep required and missing.])
fi

AC_CHECK_LIB(z, compress,, [with_zlib=no])




#include <gtk/gtk.h>

#include <beep/configfile.h>
#include <beep/util.h>
#include <bmp/plugin.h>

#include "immsconf.h"
#include "plugin.h"


    read_config();

    configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
    gtk_signal_connect(GTK_OBJECT(configure_win), "destroy",
            GTK_SIGNAL_FUNC(gtk_widget_destroyed), &configure_win);
    gtk_window_set_title(GTK_WINDOW(configure_win), "IMMS Configuration");

    gtk_container_add(GTK_CONTAINER(xidle_frame), xidle_vbox);

    xidle_desc = gtk_label_new(
            "Disable this option if you use Beep on a dedicated machine");

    gtk_label_set_line_wrap(GTK_LABEL(xidle_desc), TRUE);
    gtk_label_set_justify(GTK_LABEL(xidle_desc), GTK_JUSTIFY_LEFT);

    gtk_widget_show(xidle_hbox);

    /* Queue */
    queue_frame = gtk_frame_new("Beep Queue");
    gtk_box_pack_start(GTK_BOX(configure_vbox), queue_frame, FALSE, FALSE, 0);
    queue_vbox = gtk_vbox_new(FALSE, 10);
    gtk_container_set_border_width(GTK_CONTAINER(queue_vbox), 5);

    gtk_box_pack_start(GTK_BOX(queue_vbox), queue_hbox, FALSE, FALSE, 0);

    queue_button = gtk_check_button_new_with_label(
                "Honour Beep Queue");
    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(queue_button), use_queue);
    gtk_box_pack_start(GTK_BOX(queue_hbox), queue_button, FALSE, FALSE, 0);


    gtk_container_add(GTK_CONTAINER(sloppy_frame), sloppy_vbox);

    sloppy_desc = gtk_label_new(
            "Enable this if you use Beep Crossfade plugin, "
            "or experience misdetected song skips.");

    gtk_label_set_line_wrap(GTK_LABEL(sloppy_desc), TRUE);

            "About IMMS",
            PACKAGE_STRING "\n\n"
            "Intelligent Multimedia Management System" "\n\n"
            "IMMS is an intelligent playlist plug-in for BMP" "\n"
            "that tracks your listening patterns" "\n"
            "and dynamically adapts to your taste." "\n\n"
            "It is incredibly unobtrusive and easy to use" "\n"

Lines 6-13 Link Here

(-)imms-1.0/plugin.cc (-2 / +2 lines)
6	#include <iostream>	6	#include <iostream>
7	#include <time.h>	7	#include <time.h>
8		8
9	#include <xmms/plugin.h>	9	#include <bmp/plugin.h>
10	#include <xmms/xmmsctrl.h>	10	#include <beep/beepctrl.h>
11		11
12	#include "immsconf.h"	12	#include "immsconf.h"
13	#include "plugin.h"	13	#include "plugin.h"

Lines 57-63 Link Here

(-)imms-1.0/rules.mk (-1 / +1 lines)
57	$(warning Use 'make install-user' to install for the current user only.)	57	$(warning Use 'make install-user' to install for the current user only.)
58		58
59	install-system: libimms.so	59	install-system: libimms.so
60	${INSTALL_PROGRAM} libimms.so ${DESTDIR}`xmms-config --visualization-plugin-dir`	60	${INSTALL_PROGRAM} libimms.so ${DESTDIR}`beep-config --visualization-plugin-dir`
61		61
62	user-message:	62	user-message:
63	$(warning Defaulting to installing for current user only.)	63	$(warning Defaulting to installing for current user only.)

Lines 9-17 Link Here

(-)imms-1.0/vars.mk.in (-2 / +2 lines)
9	CORE_OBJ = imms.o immsdb.o fetcher.o picker.o spectrum.o sqldb.o \	9	CORE_OBJ = imms.o immsdb.o fetcher.o picker.o spectrum.o sqldb.o \
10	songinfo.o regexx.o strmanip.o levenshtein.o xidle.o md5.o	10	songinfo.o regexx.o strmanip.o levenshtein.o xidle.o md5.o
11		11
12	CFLAGS = `xmms-config --cflags` @DEBUG_CFLAGS@ -Wall -fPIC -D_REENTRANT	12	CFLAGS = `beep-config --cflags` @DEBUG_CFLAGS@ -Wall -fPIC -D_REENTRANT
13	CPPFLAGS = ${CFLAGS} -pedantic -fno-rtti	13	CPPFLAGS = ${CFLAGS} -pedantic -fno-rtti
14	LDFLAGS = `xmms-config --libs` @LIBS@	14	LDFLAGS = `beep-config --libs` -L/usr/X11R6/lib -lX11 @LIBS@
15	ARFLAGS = rs	15	ARFLAGS = rs
16		16
17	default: all	17	default: all

Return to bug 41543

Lines 1-8 Link Here

(-)imms-1.0/interface.c (-9 / +9 lines)
1	#include <gtk/gtk.h>	1	#include <gtk/gtk.h>
2		2
3	#include <xmms/configfile.h>	3	#include <beep/configfile.h>
4	#include <xmms/util.h>	4	#include <beep/util.h>
5	#include <xmms/plugin.h>	5	#include <bmp/plugin.h>
6		6
7	#include "immsconf.h"	7	#include "immsconf.h"
8	#include "plugin.h"	8	#include "plugin.h"
Lines 94-100 Link Here
94		94
95	read_config();	95	read_config();
96		96
97	configure_win = gtk_window_new(GTK_WINDOW_DIALOG);	97	configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
98	gtk_signal_connect(GTK_OBJECT(configure_win), "destroy",	98	gtk_signal_connect(GTK_OBJECT(configure_win), "destroy",
99	GTK_SIGNAL_FUNC(gtk_widget_destroyed), &configure_win);	99	GTK_SIGNAL_FUNC(gtk_widget_destroyed), &configure_win);
100	gtk_window_set_title(GTK_WINDOW(configure_win), "IMMS Configuration");	100	gtk_window_set_title(GTK_WINDOW(configure_win), "IMMS Configuration");
Lines 112-118 Link Here
112	gtk_container_add(GTK_CONTAINER(xidle_frame), xidle_vbox);	112	gtk_container_add(GTK_CONTAINER(xidle_frame), xidle_vbox);
113		113
114	xidle_desc = gtk_label_new(	114	xidle_desc = gtk_label_new(
115	"Disable this option if you use XMMS on a dedicated machine");	115	"Disable this option if you use Beep on a dedicated machine");
116		116
117	gtk_label_set_line_wrap(GTK_LABEL(xidle_desc), TRUE);	117	gtk_label_set_line_wrap(GTK_LABEL(xidle_desc), TRUE);
118	gtk_label_set_justify(GTK_LABEL(xidle_desc), GTK_JUSTIFY_LEFT);	118	gtk_label_set_justify(GTK_LABEL(xidle_desc), GTK_JUSTIFY_LEFT);
Lines 134-140 Link Here
134	gtk_widget_show(xidle_hbox);	134	gtk_widget_show(xidle_hbox);
135		135
136	/* Queue */	136	/* Queue */
137	queue_frame = gtk_frame_new("XMMS Queue");	137	queue_frame = gtk_frame_new("Beep Queue");
138	gtk_box_pack_start(GTK_BOX(configure_vbox), queue_frame, FALSE, FALSE, 0);	138	gtk_box_pack_start(GTK_BOX(configure_vbox), queue_frame, FALSE, FALSE, 0);
139	queue_vbox = gtk_vbox_new(FALSE, 10);	139	queue_vbox = gtk_vbox_new(FALSE, 10);
140	gtk_container_set_border_width(GTK_CONTAINER(queue_vbox), 5);	140	gtk_container_set_border_width(GTK_CONTAINER(queue_vbox), 5);
Lines 154-160 Link Here
154	gtk_box_pack_start(GTK_BOX(queue_vbox), queue_hbox, FALSE, FALSE, 0);	154	gtk_box_pack_start(GTK_BOX(queue_vbox), queue_hbox, FALSE, FALSE, 0);
155		155
156	queue_button = gtk_check_button_new_with_label(	156	queue_button = gtk_check_button_new_with_label(
157	"Honour XMMS Queue");	157	"Honour Beep Queue");
158	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(queue_button), use_queue);	158	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(queue_button), use_queue);
159	gtk_box_pack_start(GTK_BOX(queue_hbox), queue_button, FALSE, FALSE, 0);	159	gtk_box_pack_start(GTK_BOX(queue_hbox), queue_button, FALSE, FALSE, 0);
160		160
Lines 171-177 Link Here
171	gtk_container_add(GTK_CONTAINER(sloppy_frame), sloppy_vbox);	171	gtk_container_add(GTK_CONTAINER(sloppy_frame), sloppy_vbox);
172		172
173	sloppy_desc = gtk_label_new(	173	sloppy_desc = gtk_label_new(
174	"Enable this if you use XMMS Crossfade plugin, "	174	"Enable this if you use Beep Crossfade plugin, "
175	"or experience misdetected song skips.");	175	"or experience misdetected song skips.");
176		176
177	gtk_label_set_line_wrap(GTK_LABEL(sloppy_desc), TRUE);	177	gtk_label_set_line_wrap(GTK_LABEL(sloppy_desc), TRUE);
Lines 227-233 Link Here
227	"About IMMS",	227	"About IMMS",
228	PACKAGE_STRING "\n\n"	228	PACKAGE_STRING "\n\n"
229	"Intelligent Multimedia Management System" "\n\n"	229	"Intelligent Multimedia Management System" "\n\n"
230	"IMMS is an intelligent playlist plug-in for XMMS" "\n"	230	"IMMS is an intelligent playlist plug-in for BMP" "\n"
231	"that tracks your listening patterns" "\n"	231	"that tracks your listening patterns" "\n"
232	"and dynamically adapts to your taste." "\n\n"	232	"and dynamically adapts to your taste." "\n\n"
233	"It is incredibly unobtrusive and easy to use" "\n"	233	"It is incredibly unobtrusive and easy to use" "\n"

Lines 48-64 Link Here

(-)imms-1.0/configure.ac (-8 / +8 lines)
48	AC_DEFINE(LEGACY_RATINGS,, [Legacy ratings in ID3 tags support])	48	AC_DEFINE(LEGACY_RATINGS,, [Legacy ratings in ID3 tags support])
49	fi	49	fi
50		50
51	AC_CHECK_PROG(have_xmms_config, xmms-config, "yes", "no")	51	AC_CHECK_PROG(have_beep_config, beep-config, "yes", "no")
52	if test "$have_xmms_config" = "no"; then	52	if test "$have_beep_config" = "no"; then
53	AC_MSG_ERROR([xmms-config required and missing.])	53	AC_MSG_ERROR([beep-config required and missing.])
54	else	54	else
55	CPPFLAGS=`xmms-config --cflags`	55	CPPFLAGS=`beep-config --cflags`
56	fi	56	fi
57		57
58	AC_CHECK_HEADERS(xmms/plugin.h,, [with_xmms=no])	58	AC_CHECK_HEADERS(bmp/plugin.h,, [with_beep=no])
59	AC_CHECK_HEADERS(xmms/xmmsctrl.h,, [with_xmms=no])	59	AC_CHECK_HEADERS(beep/beepctrl.h,, [with_beep=no])
60	if test "$with_xmms" = "no"; then	60	if test "$with_beep" = "no"; then
61	AC_MSG_ERROR([xmms required and missing.])	61	AC_MSG_ERROR([beep required and missing.])
62	fi	62	fi
63		63
64	AC_CHECK_LIB(z, compress,, [with_zlib=no])	64	AC_CHECK_LIB(z, compress,, [with_zlib=no])