Commit d4df7350 authored by Colin Walters's avatar Colin Walters
Browse files

first attempt to sync with 0.9

parent 8bf80840
......@@ -2,6 +2,53 @@
# arch-tag: automatic-ChangeLog--rhythmbox-devel@gnome.org--2004/rhythmbox--main--0.8
#
2004-07-14 00:22:01 GMT Colin Walters <walters@verbum.org> patch-99
Summary:
Update from CVS
Revision:
rhythmbox--main--0.8--patch-99
new files:
po/.arch-ids/he.po.id po/he.po
modified files:
ChangeLog configure.ac po/ChangeLog po/vi.po
2004-07-12 18:22:49 GMT Colin Walters <walters@verbum.org> patch-98
Summary:
avoid spurious dep on newer libgnomeui
Revision:
rhythmbox--main--0.8--patch-98
modified files:
ChangeLog shell/main.c
2004-07-09 20:14:33 GMT Colin Walters <walters@verbum.org> patch-97
Summary:
backport cmdline args fix from 0.9
Revision:
rhythmbox--main--0.8--patch-97
Patches applied:
* rhythmbox-devel@gnome.org--2004/rhythmbox--main--0.9--patch-45
fix command line processing with gstreamer
modified files:
ChangeLog shell/main.c
new patches:
rhythmbox-devel@gnome.org--2004/rhythmbox--main--0.9--patch-45
2004-07-04 23:12:45 GMT Colin Walters <walters@verbum.org> patch-96
Summary:
......
......@@ -2,18 +2,6 @@
# arch-tag: automatic-ChangeLog--rhythmbox-devel@gnome.org--2004/rhythmbox--main--0.7
#
2004-04-17 17:45:03 GMT Colin Walters <walters@verbum.org> patch-254
Summary:
Update from CVS
Revision:
rhythmbox--main--0.7--patch-254
modified files:
ChangeLog po/ChangeLog po/es.po
2004-04-17 03:15:55 GMT Benjamin Otte <otte@gnome.org> patch-253
Summary:
......
......@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.7
DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install
SUBDIRS = lib corba metadata player rhythmdb widgets sources iradio shell data po component help tests
SUBDIRS = lib metadata player rhythmdb widgets sources iradio shell remote data po help tests
EXTRA_DIST = \
autogen.sh \
......
Overview of Changes in Rhythmbox 0.8.5
======================================
* Metadata loading via Xine [Bastien Nocera]
* Don't crash on duplicate database entries [Colin Walters]
* Fix random crasher when using commandline args [Colin Walters]
* Fix small display, sourcelist, and browser keybindings to
not conflict with HIG [Colin Walters]
* Actually include sk translation
New Translations
is (Gunnar Steinn Magnússon)
sk (Ivan Noris)
Updated translations
az (Metin Amiroff)
bg (Peter Slavov)
el (Nikos Charonitakis)
fi (Ilkka Tuohela)
fr (Christophe Fergeau)
it (Luca Ferretti)
Overview of Changes in Rhythmbox 0.8.4
======================================
* Many memory leak during playback fixes [Colin Walters]
* Fix initial sorting [Colin Walters]
* Make size-limited automatic playlists work [Colin Walters]
* Make editing automatic playlists with size/count limits work [Colin Walters]
* Fix seeking on short tracks [Juergen Kreileder]
* Sync play/forward/back buttons after play order change [Colin Walters]
* Make supported media type tests dynamic, add audio/x-m4a if faad plugin is available [Colin Walters]
* Play even 0-rated songs sometimes in weighted random mode [Nils Philippsen]
New translations
sk (Ivan Noris)
Updated translations
et (Priit Laes)
ca (Jordi Mallach)
no (Kjartan Maraas)
de (Christian Neumair)
pt (Duarte Loreto)
sv (Christian Rose)
Overview of Changes in Rhythmbox 0.8.3
======================================
* Revert change to use authentication callbacks, it broke too much [Colin Walters]
* Don't crash on gnome-panel restart [Bastien Nocera]
* Plug a memory leak [Colin Walters]
Updated translations
et (Priit Laes)
nl (Tino Meinen)
Overview of Changes in Rhythmbox 0.8.2
======================================
* Fixed Rhythmbox GUI when using an RTL locale [Christophe Fergeau]
* Require GStreamer 0.8.1 [Colin Walters]
* Fix issue with previous button in playlists [Colin Walters]
* Allow playback of untagged mp3s [Benjamin Otte]
* Don't crash on passing directory on cmdline [Colin Walters]
* Convert more filenames to UTF-8 [Colin Walters]
* Show errors during initial import too [Colin Walters]
* Set up GnomeVFS authentication callbacks [Colin Walters]
* Avoid ReplayGain setup delay [Juergen Kreileder]
* Add DOCTYPE to docs [Mariano Suárez-Alvarez]
* Prevent crash when the GConf schema wasn't properly installed [Colin Walters]
* Make auto rating work much better [Jacques Fortier]
* Squash a major memory leak with size-limited automatic playlists [Colin Walters]
* Don't spew (harmless) warnings in small-mode playback [Colin Walters]
Updated translations
ru (Russian team)
Overview of Changes in Rhythmbox 0.8.1
======================================
* Really fix playlist saving [Colin Walters]
* Include completely untagged files too [Christophe Fergeau]
* Fix .applications file to handle any gnome-vfs location [Christophe Fergeau]
* Fix iPod compilation on big-endian machines [Christophe Fergeau]
* Find iradio-initial.pls correctly [Colin Walters]
* Fix a prototype [Ben Liblit]
* Make saving playlists dialog work with GTK+2.4 [Colin Walters]
* Squash a few small memleaks [Benjamin Otte]
Updated translations
es (Francisco Javier F. Serrador)
pl (Artur Flinta)
ja (Takeshi AIHANA)
Overview of Changes in Rhythmbox 0.8.0
======================================
* Fix playlist saving [Colin Walters]
* Memory leak fixes [Benjamin Otte]
* Ignore .Trash directories [Jonathan Blandford]
* Add audio/x-mod to known music types [Colin Walters]
* Several drag and drop fixes [Colin Walters]
* Fix usage of GtkFileSelection [Colin Walters]
* Revert back to using "Music Player" as Name [Colin Walters]
* Add code to guard against some GConf errors [Colin Walters]
* Display error on missing help files [Colin Walters]
* Some station properties dialog UI tweaks [Colin Walters]
* Remove quality column for now, it doesn't work [Colin Walters]
* Require GStreamer 0.8 [Colin Walters]
* Handle invalid UTF-8 when parsing playlists [Colin Walters]
* Fixes to bonobo interface [Colin Walters]
* Quote names with spaces for allmusic.com URIs [Colin Walters]
* Disable GTK+ sounds just for Rhythmbox [Miguel Coca]
* Better error message on missing plugin [Colin Walters]
* Fix GConf schema default for selected source [Colin Walters]
* A really major crasher bug fixed [Colin Walters]
* Allow player to release audio sink when GStreamer supports it [Benjamin Otte]
* Fix several crashers in multiple selection dialog [Colin Walters]
New translations:
en_CA (Adam Weinberger)
en_GB (David Lodge)
pa (Punjab Linux Technology)
Updated translations:
id (Mohammad DAMT)
lt (Žygimantas Beručka)
cs (Miloslav Trmac)
ca (Jordi Mallach)
pt_BR (Raphael Higino)
es (Francisco Javier F. Serrador)
nl (Vincent van Adrighem)
sv (Christian Rose)
pl (Artur Flinta)
da (Ole Laursen)
pt (Duarte Loreto)
no (Kjartan Maraas)
sr (Danilo Šegan)
hr (Andras Timar)
Overview of Changes in Rhythmbox 0.7.2
======================================
......
......@@ -41,12 +41,24 @@ In the bug report please include:
And anything else you think is relevant.
* If rhythmbox crashes when you try to import a folder full of music files
to your library, you can pinpoint the exact file causing the crash
by running rhythmbox -d from a console. It will output lots of debugging
information, the last file mentioned in the console output will quite likely
correspond to the file causing the crash.
* Before you report a bug, it will be useful to know if GStreamer works.
Try running this command:
If you have playback issues, try running this command:
$ gst-launch-0.8 gnomevfssrc location=/path/to/my/musicfile.ogg ! spider ! volume ! audioscale ! audioconvert ! $(gconftool-2 -g /system/gstreamer/0.8/default/audiosink)
Just replace /path/to/my/musicfile.ogg with some sound file.
If you have troubles importing a specific file to your library, try running:
$ gst-launch-0.8 filesrc location=/path/to/my/musicfile.ogg ! typefind ! spider ! audio/x-raw-int ! fakesink
Just replace /path/to/my/musicfile.ogg with some sound file in the 2 commands
above.
You might also want to try the monkey-media tests/test-cmdline program.
* How to reproduce the bug.
......
......@@ -62,8 +62,10 @@ fi
ACLOCAL=aclocal-1.7
else
echo
echo "You must have automake >= 1.7 installed to compile $PROJECT."
echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.8.3.tar.gz"
echo "You must have automake 1.7 installed to compile $PROJECT."
echo "automake 1.8 isn't supported, patches are welcome though."
echo "automake 1.7 is parallel installable with automake 1.8."
echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.7.9.tar.gz"
echo "(or a newer version if it is available)"
DIE=1
fi
......
......@@ -660,7 +660,7 @@ rb_player_sync_pipeline (RBPlayer *mp, gboolean iradio_mode, GError **error)
/* this makes sure someone removes this later on */
g_assert (major == 0);
g_assert (minor == 8);
if (micro > 1)
if (micro >= 1)
may_pause = 1;
else
may_pause = 0;
......
Makefile
Makefile.in
*.server.in
*.server
.arch-ids
## arch-tag: Automake rules for the Nautilus component
INCLUDES = \
-DG_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED \
-DDATADIR=\"$(datadir)\" \
-I$(top_srcdir) \
-I$(top_builddir) \
$(DISABLE_DEPRECATED_CFLAGS) \
$(RHYTHMBOX_CFLAGS)
bonobodir = $(libdir)/bonobo
bonobo_LTLIBRARIES = librb-nautilus-context-menu.la
librb_nautilus_context_menu_la_SOURCES = \
rb-nautilus-context-menu.c \
rb-nautilus-context-menu.h \
libmain.c
librb_nautilus_context_menu_la_LIBADD = $(top_builddir)/corba/librbcorba.la $(RHYTHMBOX_LIBS)
librb_nautilus_context_menu_la_LDFLAGS = -module -avoid-version
server_in_files = Rhythmbox_Nautilus_Context_Menu.server.in.in
serverdir = $(libdir)/bonobo/servers
server_DATA = $(server_in_files:.server.in.in=.server)
$(server_in_files:.server.in.in=.server.in): $(server_in_files)
sed -e "s|\@BONOBODIR\@|$(bonobodir)|" $< > $@
@INTLTOOL_SERVER_RULE@
EXTRA_DIST = $(server_in_files)
CLEANFILES = $(server_DATA) $(server_in_files:.server.in.in=.server.in)
<oaf_info>
<oaf_server iid="OAFIID:Rhythmbox_Nautilus_Context_Menu_Item"
type="shlib" location="@BONOBODIR@/librb-nautilus-context-menu.so">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Bonobo/Listener:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" stype="string" _value="Rhythmbox Nautilus Context Menu Item"/>
<oaf_attribute name="description" type="string" _value="Nautilus context menu extension for Rhythmbox"/>
<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv">
<item value="file"/>
</oaf_attribute>
<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
<item value="x-directory/normal"/>
<item value="audio/*"/>
<item value="application/x-ogg"/>
<item value="application/ogg"/>
</oaf_attribute>
<oaf_attribute name="nautilus:context_menu_handler" type="boolean" value="true"/>
<oaf_attribute name="nautilus:can_handle_multiple_files" type="boolean" value="true"/>
<oaf_attribute name="nautilusverb:AddToLibrary" type="string" _value="Add to Music Library"/>
<oaf_attribute name="nautilus:icon" type="string" value="rhythmbox"/>
</oaf_server>
</oaf_info>
/*
* arch-tag: Nautilus context menu constructor
* Copyright (C) 2000, 2001 Eazel, Inc
*
* 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 the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
* Author: Maciej Stachowiak
*/
/* libmain.c - object activation infrastructure for shared library
version of tree view. */
#include <config.h>
#include <string.h>
#include "rb-nautilus-context-menu.h"
#include <bonobo.h>
#include <bonobo-activation/bonobo-activation.h>
#define RB_NAUTILUS_CONTEXT_MENU_IID "OAFIID:Rhythmbox_Nautilus_Context_Menu_Item"
static CORBA_Object
rhythmbox_shlib_make_object (PortableServer_POA poa,
const char *iid,
gpointer impl_ptr,
CORBA_Environment *ev)
{
RbNautilusContextMenu *rncm;
if (strcmp (iid, RB_NAUTILUS_CONTEXT_MENU_IID) != 0) {
return CORBA_OBJECT_NIL;
}
rncm = RB_NAUTILUS_CONTEXT_MENU (g_object_new (TYPE_RB_NAUTILUS_CONTEXT_MENU, NULL));
bonobo_activation_plugin_use (poa, impl_ptr);
return CORBA_Object_duplicate (BONOBO_OBJREF (rncm), ev);
}
static const BonoboActivationPluginObject plugin_list[] = {
{ RB_NAUTILUS_CONTEXT_MENU_IID, rhythmbox_shlib_make_object },
{ NULL }
};
const BonoboActivationPlugin Bonobo_Plugin_info = {
plugin_list,
"Rhythmbox Nautilus Context Menu"
};
......@@ -3,7 +3,7 @@ define(arch-tag)
AC_PREREQ(2.53)
AC_INIT(shell)
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(rhythmbox, 0.8.5)
AM_INIT_AUTOMAKE(rhythmbox, 0.8.99)
AM_MAINTAINER_MODE
......@@ -32,44 +32,60 @@ else
AC_MSG_RESULT([no])
fi
PKG_CHECK_MODULES(RHYTHMBOX, \
gtk+-2.0 >= 2.2.2 \
libgnomeui-2.0 \
libglade-2.0 \
gnome-vfs-2.0 \
gnome-vfs-module-2.0 \
libbonobo-2.0 \
bonobo-activation-2.0)
RHYTHMBOX_CFLAGS="$CFLAGS $RHYTHMBOX_CFLAGS"
PKG_CHECK_MODULES(UNUSED, gtk+-2.0 >= 2.4.0, [have_gtk_23=yes], [have_gtk_23=no])
if test x"$have_gtk_23" = xyes; then
AC_DEFINE(HAVE_GTK_2_3, 1, [Define if you have GTK+ 2.4.0 or better])
fi
AM_CONDITIONAL(WITH_GTK22, test x"$have_gtk_23" != xyes)
dnl iPod support
dnl enable_ipod = "no"
HAL_REQUIRED=0.2.92
AC_ARG_ENABLE(ipod,
AC_HELP_STRING([--enable-ipod],
[Enable iPod support in Rhythmbox]))
AC_HELP_STRING([--enable-ipod],
[Enable iPod support in Rhythmbox]))
AM_CONDITIONAL(USE_IPOD, test x"$enable_ipod" = xyes)
if test x"$enable_ipod" = xyes; then
AC_DEFINE(WITH_IPOD_SUPPORT, 1, [Define if iPod support is enabled])
USE_HAL=""
PKG_CHECK_MODULES(HAL, hal,
[ AC_DEFINE([HAVE_HAL], 1, [Use the HAL library]) ]
[ USE_HAL="hal >= $HAL_REQUIRED" ], :)
fi
PKG_CHECK_MODULES(RHYTHMBOX, \
gtk+-2.0 >= 2.4 \
libgnomeui-2.0 \
libglade-2.0 \
gnome-vfs-2.0 >= 2.6 \
gnome-vfs-module-2.0 \
$USE_HAL)
RHYTHMBOX_CFLAGS="$CFLAGS $RHYTHMBOX_CFLAGS"
dnl Database
AC_ARG_WITH(database,
AC_HELP_STRING([--with-database=tree],
[Select the database to use]),,
AC_HELP_STRING([--with-database=tree|libgda],
[Select the database to use (default tree)]),,
with_database=tree)
AM_CONDITIONAL(USE_TREEDB, test x"$with_database" = xtree)
if test x"$with_database" = xtree; then
AC_DEFINE(WITH_RHYTHMDB_TREE, 1, [Define if you are using the RhythmDB tree database])
else
AC_MSG_ERROR([Unknown database selected])
fi
AM_CONDITIONAL(USE_GDADB, test x"$with_database" = xlibgda)
GDA_CFLAGS=""
GDA_LIBS=""
case "x$with_database" in
"xtree")
AC_DEFINE(WITH_RHYTHMDB_TREE, 1, [Define if you are using the RhythmDB tree database])
;;
"xlibgda")
AC_DEFINE(WITH_RHYTHMDB_GDA, 1, [Define if you are using the RhythmDB sqlite/libgda database])
dnl FIXME: check for sqlite, too?
PKG_CHECK_MODULES(GDA, libgda > 1.0.3)
;;
*)
AC_MSG_ERROR([Unknown database selected])
;;
esac
AC_SUBST(GDA_CFLAGS)
AC_SUBST(GDA_LIBS)
dnl Database debugging
......@@ -194,33 +210,6 @@ fi
AM_CONDITIONAL(WITH_XINE_METADATA, test x"$with_metadata" = "xxine")
AM_CONDITIONAL(WITH_GST_METADATA, test x"$with_metadata" = "xgstreamer")
dnl Stolen from D-BUS configury
dnl Atomic integers (checks by Sebastian Wilhelmi for GLib)
AC_MSG_CHECKING([whether to use inline assembler routines for atomic integers])
have_atomic_inc=no
if test x"$GCC" = xyes; then
if test "x$enable_ansi" = "xyes"; then
AC_MSG_RESULT([no])
else
case $host_cpu in
i386)
AC_MSG_RESULT([no])
;;
i?86)
AC_MSG_RESULT([i486])
AC_DEFINE_UNQUOTED(RB_USE_ATOMIC_INT_486, 1, [Use atomic integer implementation for 486])
have_atomic_inc=yes
;;
*)
AC_MSG_RESULT([no])
;;
esac
fi
fi
if test x$have_atomic_inc = xyes ; then
AC_DEFINE_UNQUOTED(RB_HAVE_ATOMIC_INT, 1, [Some atomic integer implementation present])
fi
dnl AC_CHECK_LIB(lirc_client, lirc_init,
dnl [ AC_CHECK_HEADER(lirc/lirc_client.h,
dnl [ RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS -llirc_client"
......@@ -519,7 +508,8 @@ player/Makefile
rhythmdb/Makefile
widgets/Makefile
iradio/Makefile
corba/Makefile
remote/Makefile
remote/bonobo/Makefile
shell/Makefile
data/Makefile
data/ui/Makefile
......@@ -530,7 +520,6 @@ sources/Makefile
help/Makefile
help/C/Makefile
po/Makefile.in
component/Makefile
tests/Makefile
rhythmbox.spec
])
......@@ -538,6 +527,8 @@ rhythmbox.spec
AC_MSG_NOTICE([Rhythmbox was configured with the following options:])
if test x"$with_database" = xtree; then
AC_MSG_NOTICE([** Tree database is enabled])
elif test x"$with_database" = xlibgda; then
AC_MSG_NOTICE([** libgda/sqlite database is enabled])
else
AC_MSG_ERROR([Unknown database!])
fi
......
Rhythmbox.h
Rhythmbox-stubs.c
Rhythmbox-skels.c
Rhythmbox-common.c
Makefile.in
Makefile
test-corba
.arch-ids
/*
* arch-tag: Simple program to test bonobo notification from rhythmbox
*/
#include <stdlib.h>
#include <libbonobo.h>
#include "Rhythmbox.h"
#define RB_IID "OAFIID:GNOME_Rhythmbox"
static void
on_bonobo_event (BonoboListener *listener, const char *event_name,
const CORBA_any *any, CORBA_Environment *ev,
gpointer user_data)
{
g_print ("event received: %s\n", event_name);
}
static void
on_song_change (BonoboListener *listener, const char *event_name,
const CORBA_any *any, CORBA_Environment *ev,
gpointer user_data)
{
GNOME_Rhythmbox_SongInfo *song_info;
if (!CORBA_TypeCode_equivalent (any->_type,
TC_GNOME_Rhythmbox_SongInfo,
NULL)) {
g_warning ("Unexpected type\n");
}
song_info = (GNOME_Rhythmbox_SongInfo *)any->_value;
if (song_info == NULL) {
g_warning ("Unexpected error\n");
}
g_print ("Now Playing:\n");
g_print ("Title: %s\n", song_info->title);
g_print ("Artist: %s\n", song_info->artist);
g_print ("Album: %s\n", song_info->album);
g_print ("Bitrate: %u bps\n", song_info->bitrate);
g_print ("Length: %u\n", song_info->duration);
}
int
main (int argc, char *argv [])
{
GNOME_Rhythmbox rb;
CORBA_Environment ev;
Bonobo_PropertyBag pb;
/*
* Initialize bonobo.
*/
if (!bonobo_init (&argc, argv))
g_error ("Could not initialize Bonobo");
CORBA_exception_init (&ev);
rb = bonobo_activation_activate_from_id (RB_IID, 0, NULL, &ev);
if (rb == CORBA_OBJECT_NIL) {
g_warning ("Could not create an instance of Rhythmbox");
return bonobo_debug_shutdown ();
}
CORBA_exception_init (&ev);
pb = GNOME_Rhythmbox_getPlayerProperties (rb, &ev);