Re: [Rhythmbox-devel] Music sharing

I'm getting this error now w/ and w/o the --enable-daap flag, just checked out fresh CVS:

 gcc -DHAVE_CONFIG_H -I. -I. -I.. -DGNOMELOCALEDIR=\"/usr/share/locale\" -DG_LOG_DOMAIN=\"Rhythmbox\" -I.. -I../lib -I../metadata -I../sources -I../shell -I../rhythmdb -I../widgets -DORBIT2=1 -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -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/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/freetype2 -I/usr/include/libxml2 -I/usr/include/libglade-2.0 -I/usr/include/gnome-vfs-module-2.0 -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/libnautilus-burn -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -g -O2 -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 -Wall -Werror -std=gnu89 -MT rb-player-gst.lo -MD -MP -MF .deps/rb-player-gst.Tpo -c rb-player-gst.c  -fPIC -DPIC -o .libs/rb-player-gst.o
rb-player-gst.c: In function `rb_player_get_time':
rb-player-gst.c:787: error: parse error before '<<' token
rb-player-gst.c:796: error: `ret' undeclared (first use in this function)
rb-player-gst.c:796: error: (Each undeclared identifier is reported only once
rb-player-gst.c:796: error: for each function it appears in.)
rb-player-gst.c:797: error: parse error before '==' token
rb-player-gst.c:803: confused by earlier errors, bailing out
make[3]: *** [rb-player-gst.lo] Error 1
make[3]: Leaving directory `/home/jcotton/source/rhythmbox/player'
make[2]: *** [all] Error 2
make[2]: Leaving directory `/home/jcotton/source/rhythmbox/player'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/home/jcotton/source/rhythmbox'
make: *** [all] Error 2

and the relevant part of rb-player-gst.c is (starting at 779):
rb_player_get_time (RBPlayer *mp)
    g_return_val_if_fail (RB_IS_PLAYER (mp), -1);

    if (mp->priv->playbin != NULL) {
        gint64 gst_position;
        GstFormat fmt = GST_FORMAT_TIME;
        gst_element_query (mp->priv->playbin, GST_QUERY_POSITION, &fmt, &gst_position);
<<<<<<< rb-player-gst.c

        ret = (glong) (gst_position / (1000*1000*1000));
        if (mp->priv->uri && g_strncasecmp (mp->priv->uri, "daap://", 7) == 0) {
            ret += rb_daap_src_get_time ();

        return ret;
        return (long)(gst_position / (1000*1000*1000));
>>>>>>> 1.42
    } else
        return -1;

the ChangeLog says this should be fixed:
2005-09-06   Charles Schmidt   <cschmidt2 emich edu>
        * Fix for extra <<<<<<< & ======= that accidentally made
        it in last time.  Sorry.


On 9/6/05, Charles Schmidt <cschmidt2 emich edu> wrote:
On Tue, 2005-09-06 at 15:33 +0200, Luca Ferretti wrote:
> Il giorno mar, 06/09/2005 alle 03.57 -0400, Charles Schmidt ha scritto:
> > -
> >
> > I committed music sharing to CVS this morning.  Changes from the last
> > patch posted the ML are basically getting it working with the more
> > recent changes to RB CVS and avahi mdns support (in addition to howl).
> A first list of missing stuff :-)
> * l10n/i18n: please add relevant files in po/, if any. I
> still have to update my po file, so eventually ignore this.

Think I've fixed this?  I am not at all familiar the whole i18n thing,
so if theres something else I have to do, please let me know.

> * libsoup support: I'm not sure, but GNOME 2.12 should use libsoup-2.4.
> By now configure check only for libsoup-2.2.pc. Could you check for
> libsoup-2.4 too? I suppose it should work.

Should work now, though I havnt tested 2.4, so I dunno if it actually
does work.  Can't imagine it wouldn't though.

> * README.daap: could you add a README.daap file explaining needed stuff
> and usage? If it's an experimental feature, we can't still add to user
> manual.



rhythmbox-devel mailing list
rhythmbox-devel gnome org

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]