Re: patch #4 (Was: [Rhythmbox-devel] music sharing patch #3)

[Charles Schmidt <cschmidt2 emich edu>]

On Tue, 2005-08-23 at 23:46 +0100, Peter Robinson wrote:
> > Working on this (avahi support) now.
> 
> Problem is its only a 0.1 release and not shipped anywhere yet
> (although wouldn't be hard to knock off howl :-)
> 
> > Yes. Thanks for catching that.  I'm pretty sure we need to say we're
> > iTunes, but I can check into this.
> 
> Be interesting to know!
> 
> > This patch should work for everyone.  It fixes the signed errors, and
> > fixes the errors that occured when you tried to compile /without/
> > --enable-daap (but why would you want to do that? *grin*).  The patch is
> > against CVS, as usual, but might apply against 0.9.0, any one have any
> > luck with this?
> 
> Some idiot that adds the patch to his build script and forgets to
> enable it *grin*!
> 
> Still having the same error as before (after I actually enabled daap)
> although it now builds with the patch applied and not enabled (so that
> bit works :-). I'm running a slightly patched FC4 (your patch for gst
> and totem 1.1.3). Output below fyi.
> 
> BTW looking foward to it... love your work :-)
> 
> Cheers,
> Pete
> 
>  gcc -DHAVE_CONFIG_H -I. -I. -I..
> -DGNOMELOCALEDIR=\"/usr/share/locale\" -DG_LOG_DOMAIN=\"Rhythmbox\"
> -I.. -I../lib -I../lib -I../corba -I../corba -I../rhythmdb
> -I../library -I../iradio -I../widgets -I../shell -I../sources
> -DPIXMAP_DIR=\"/usr/share/pixmaps\"
> -DSHARE_DIR=\"/usr/share/rhythmbox\" -DDATADIR=\"/usr/share\" -O2 -g
> -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -m32 -march=i386
> -mtune=pentium4 -fasynchronous-unwind-tables -DXTHREADS -D_REENTRANT
> -DXUSE_MTSAFE_API -DORBIT2=1 -pthread -DDBUS_API_SUBJECT_TO_CHANGE
> -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include
> -I/usr/include/atk-1.0 -I/usr/include/pango-1.0
> -I/usr/include/freetype2 -I/usr/include/freetype2/config
> -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
> -I/usr/include/libgnomeui-2.0 -I/usr/include/libgnome-2.0
> -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libart-2.0
> -I/usr/include/gconf/2 -I/usr/include/libbonoboui-2.0
> -I/usr/include/orbit-2.0 -I/usr/include/libbonobo-2.0
> -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include
> -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2
> -I/usr/include/libglade-2.0 -I/usr/include/gnome-vfs-module-2.0
> -I/usr/include/totem/1/plparser -I/usr/include/dbus-1.0
> -I/usr/lib/dbus-1.0/include -I/usr/include/hal -D_LARGEFILE_SOURCE
> -D_FILE_OFFSET_BITS=64 -pthread -DORBIT2=1
> -I/usr/include/gstreamer-0.8 -I/usr/include/glib-2.0
> -I/usr/lib/glib-2.0/include -I/usr/include/libxml2
> -I/usr/include/gconf/2 -I/usr/include/orbit-2.0
> -I/usr/include/libsoup-2.2 -I/usr/include/libxml2
> -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
> -I/usr/include/howl-0.9.8 -I/usr/X11R6/include -Wcomment -Wformat
> -Wnonnull -Wimplicit-int -Wimplicit -Wmain -Wmissing-braces
> -Wparentheses -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs
> -Wunused-function -Wunused-label -Wunused-value -Wchar-subscripts
> -Wmissing-declarations -Wmissing-prototypes -Wnested-externs
> -Wpointer-arith -Wcast-align -Werror -std=gnu89 -MT rb-daap-share.lo
> -MD -MP -MF .deps/rb-daap-share.Tpo -c rb-daap-share.c  -fPIC -DPIC -o
> .libs/rb-daap-share.o
> cc1: warnings being treated as errors
> rb-daap-share.c: In function 'databases_cb':
> rb-daap-share.c:925: warning: implicit declaration of function
> 'rb_playlist_source_get_model'
> rb-daap-share.c:925: warning: nested extern declaration of
> 'rb_playlist_source_get_model'
> rb-daap-share.c:925: warning: assignment makes pointer from integer
> without a cast
> make[2]: *** [rb-daap-share.lo] Error 1
> make[2]: Leaving directory `/usr/src/redhat/BUILD/rhythmbox-0.9.0/daapsharing'
> make[1]: *** [all-recursive] Error 1
> make[1]: Leaving directory `/usr/src/redhat/BUILD/rhythmbox-0.9.0'
> make: *** [all] Error 2

A recent CVS commit that hasn't filtered through to anonymous CVS
removed that function from rb-playlist-source.c & .h.   Until it filters
through and/or I get real CVS access, a temporary fix is to add:

RhythmDBQueryModel *rb_playlist_source_get_model(RBPlaylistSource
*source);

to sources/rb-playlist-source.h

and add

RhythmDBQueryModel *
rb_playlist_source_get_model (RBPlaylistSource *source)
{
	return source->priv->model;
}

to sources/rb-playlist-source.c

sorry about that, blame James :)

-charlie