Changeset 282

Show
Ignore:
Timestamp:
01/12/09 17:09:07 (3 years ago)
Author:
ath
bzr:committer:
Alberto Botti <alberto.botti@gmail.com>
bzr:file-ids:

fm_gui/src/marlin-window-menu.c 255@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_gui%2Fsrc%2Fmarlin-window-menu.c
fm_server/src/fm_input_buffer/Makefile.am 276@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_server%2Fsrc%2Ffm_input_buffer%2FMakefile.am
fm_server/src/fm_input_buffer/Makefile.in 276@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_server%2Fsrc%2Ffm_input_buffer%2FMakefile.in
fm_server/src/fm_input_cdj.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_server%2Fsrc%2Ffm_input_cdj.c
rgc/include/server/rgc_marshal.h 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fserver%2Frgc_marshal.h
rgc/src/server/rgc_marshal.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fserver%2Frgc_marshal.c
bzr:merge:

alberto.botti@gmail.com-20090112160735-4gn3z63hezacfu23
bzr:revno:
74
bzr:revprop:branch-nick:
trunk
bzr:root:
trunk
bzr:text-parents:

fm_gui/src/marlin-window-menu.c alberto.botti@gmail.com-20090112160735-4gn3z63hezacfu23
fm_server/src/fm_input_buffer/Makefile.am alberto.botti@gmail.com-20090112160735-4gn3z63hezacfu23
fm_server/src/fm_input_buffer/Makefile.in alberto.botti@gmail.com-20090112160735-4gn3z63hezacfu23
fm_server/src/fm_input_cdj.c alberto.botti@gmail.com-20090112160735-4gn3z63hezacfu23
rgc/include/server/rgc_marshal.h alberto.botti@gmail.com-20090112160735-4gn3z63hezacfu23
rgc/src/server/rgc_marshal.c alberto.botti@gmail.com-20090112160735-4gn3z63hezacfu23
bzr:timestamp:
2009-01-12 17:08:51.351999998 +0100
Message:

Build fixes after the git "disaster".

Location:
trunk
Files:
7 modified

Legend:

Unmodified
Added
Removed

  • trunk

    • Property bzr:ancestry:v3-trunk0

      •  

        old new  
        11alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
         2alberto.botti@gmail.com-20090112160735-4gn3z63hezacfu23 
    • Property bzr:file-ids

      •  

        old new  
        1 INSTALL 216@45ad373b-3914-0410-8193-a61cc481f39f:trunk:INSTALL 
        2 install-sh      216@45ad373b-3914-0410-8193-a61cc481f39f:trunk:install-sh 
        3 missing 216@45ad373b-3914-0410-8193-a61cc481f39f:trunk:missing 
        4 rgc/INSTALL     210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2FINSTALL 
        5 rgc/Makefile.in 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2FMakefile.in 
        6 rgc/aclocal.m4  210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Faclocal.m4 
        7 rgc/config.guess        210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fconfig.guess 
        8 rgc/config.h.in 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fconfig.h.in 
        9 rgc/config.sub  210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fconfig.sub 
        10 rgc/configure   210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fconfigure 
        11 rgc/configure.ac        215@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fconfigure.ac 
        12 rgc/depcomp     210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fdepcomp 
        13 rgc/include/Makefile.in 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2FMakefile.in 
        14 rgc/include/client/Makefile.in  210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fclient%2FMakefile.in 
        15 rgc/include/common/Makefile.in  210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fcommon%2FMakefile.in 
        16 rgc/include/connection/Makefile.in      210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fconnection%2FMakefile.in 
        17 rgc/include/connection/rbp/Makefile.in  210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fconnection%2Frbp%2FMakefile.in 
        18 rgc/include/server/Makefile.in  210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fserver%2FMakefile.in 
        19 rgc/install-sh  210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finstall-sh 
        20 rgc/ltmain.sh   210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fltmain.sh 
        21 rgc/m4/libtool.m4       libtool.m4-20090107122845-jrcu8jgd4l6uescz-1 
        22 rgc/m4/ltoptions.m4     ltoptions.m4-20090107122845-jrcu8jgd4l6uescz-2 
        23 rgc/m4/ltsugar.m4       ltsugar.m4-20090107122845-jrcu8jgd4l6uescz-3 
        24 rgc/m4/ltversion.m4     ltversion.m4-20090107122845-jrcu8jgd4l6uescz-4 
        25 rgc/m4/lt%7Eobsolete.m4 ltobsolete.m4-20090107122845-jrcu8jgd4l6uescz-5 
        26 rgc/missing     210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fmissing 
        27 rgc/mkinstalldirs       210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fmkinstalldirs 
        28 rgc/src/Makefile.in     210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2FMakefile.in 
        29 rgc/src/client/Makefile.in      210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fclient%2FMakefile.in 
        30 rgc/src/common/Makefile.in      210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fcommon%2FMakefile.in 
        31 rgc/src/connection/Makefile.in  210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2FMakefile.in 
        32 rgc/src/connection/rbp/Makefile.in      210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frbp%2FMakefile.in 
        33 rgc/src/server/Makefile.in      210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fserver%2FMakefile.in 
        34 rgc/test/Makefile.in    210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Ftest%2FMakefile.in 
         1fm_gui/src/marlin-window-menu.c 255@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_gui%2Fsrc%2Fmarlin-window-menu.c 
         2fm_server/src/fm_input_buffer/Makefile.am       276@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_server%2Fsrc%2Ffm_input_buffer%2FMakefile.am 
         3fm_server/src/fm_input_buffer/Makefile.in       276@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_server%2Fsrc%2Ffm_input_buffer%2FMakefile.in 
         4fm_server/src/fm_input_cdj.c    210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_server%2Fsrc%2Ffm_input_cdj.c 
         5rgc/include/server/rgc_marshal.h        210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fserver%2Frgc_marshal.h 
         6rgc/src/server/rgc_marshal.c    210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fserver%2Frgc_marshal.c 
    • Property bzr:revision-id:v3-trunk0

      •  

        old new  
        1162 alberto.botti@gmail.com-20090107124157-8nwd4wy07jd1aey6 
         274 alberto.botti@gmail.com-20090112160851-guz0xqojvyl7xvbf 
    • Property bzr:revision-info

      •  

        old new  
        1 timestamp: 2009-01-07 13:41:57.200999975 +0100 
         1timestamp: 2009-01-12 17:08:51.351999998 +0100 
        22committer: Alberto Botti <alberto.botti@gmail.com> 
        33properties:  
    • Property bzr:text-parents

      •  

        old new  
        1 INSTALL alberto.botti@gmail.com-20090107122405-vhbxkshgfhlx8kyv 
        2 install-sh      alberto.botti@gmail.com-20090107122405-vhbxkshgfhlx8kyv 
        3 missing alberto.botti@gmail.com-20090107122405-vhbxkshgfhlx8kyv 
        4 rgc/INSTALL     alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        5 rgc/Makefile.in alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        6 rgc/aclocal.m4  alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        7 rgc/config.guess        alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        8 rgc/config.h.in alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        9 rgc/config.sub  alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        10 rgc/configure   alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        11 rgc/configure.ac        alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        12 rgc/depcomp     alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        13 rgc/include/Makefile.in alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        14 rgc/include/client/Makefile.in  alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        15 rgc/include/common/Makefile.in  alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        16 rgc/include/connection/Makefile.in      alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        17 rgc/include/connection/rbp/Makefile.in  alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        18 rgc/include/server/Makefile.in  alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        19 rgc/install-sh  alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        20 rgc/ltmain.sh   alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        21 rgc/m4/libtool.m4       alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        22 rgc/m4/ltoptions.m4     alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        23 rgc/m4/ltsugar.m4       alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        24 rgc/m4/ltversion.m4     alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        25 rgc/m4/lt%7Eobsolete.m4 alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        26 rgc/missing     alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        27 rgc/mkinstalldirs       alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        28 rgc/src/Makefile.in     alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        29 rgc/src/client/Makefile.in      alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        30 rgc/src/common/Makefile.in      alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        31 rgc/src/connection/Makefile.in  alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        32 rgc/src/connection/rbp/Makefile.in      alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        33 rgc/src/server/Makefile.in      alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
        34 rgc/test/Makefile.in    alberto.botti@gmail.com-20090107123524-0qkwjfwz3rthe01q 
         1fm_gui/src/marlin-window-menu.c alberto.botti@gmail.com-20090112160735-4gn3z63hezacfu23 
         2fm_server/src/fm_input_buffer/Makefile.am       alberto.botti@gmail.com-20090112160735-4gn3z63hezacfu23 
         3fm_server/src/fm_input_buffer/Makefile.in       alberto.botti@gmail.com-20090112160735-4gn3z63hezacfu23 
         4fm_server/src/fm_input_cdj.c    alberto.botti@gmail.com-20090112160735-4gn3z63hezacfu23 
         5rgc/include/server/rgc_marshal.h        alberto.botti@gmail.com-20090112160735-4gn3z63hezacfu23 
         6rgc/src/server/rgc_marshal.c    alberto.botti@gmail.com-20090112160735-4gn3z63hezacfu23 

  • trunk/fm_gui/src/marlin-window-menu.c

    r279 r282  
    673673          N_("Go to end of sample"), 
    674674          G_CALLBACK (media_next) }, 
    675         { "MediaRecord", MARLIN_STOCK_RECORD, N_("_Record..."), NULL, 
     675/*      { "MediaRecord", MARLIN_STOCK_RECORD, N_("_Record..."), NULL, 
    676676          N_("Record a new sample"), 
    677           G_CALLBACK (media_record) }, 
     677          G_CALLBACK (media_record) },*/ 
    678678        { "MediaForward", MARLIN_STOCK_FFWD, N_("Step _Forwards"), NULL, 
    679679          N_("Step forward through the sample"), 
    … …  
    682682          N_("Step backwards through the sample"), 
    683683          G_CALLBACK (media_rewind) }, 
    684         { "MediaRepeat", MARLIN_STOCK_REPEAT, N_("Play _Loop"), NULL, 
     684/*      { "MediaRepeat", MARLIN_STOCK_REPEAT, N_("Play _Loop"), NULL, 
    685685          N_("Loop sample or selection"), 
    686           G_CALLBACK (media_repeat) }, 
     686          G_CALLBACK (media_repeat) },*/ 
    687687}; 
    688688 

  • trunk/fm_server/src/fm_input_buffer/Makefile.am

    r276 r282  
    66 
    77 
    8 bin_PROGRAMS = buffer_test gst_test 
    9  
    10 buffer_test_SOURCES = \ 
    11         buffer_test.c 
    12  
    13 buffer_test_LDADD = \ 
    14         libfm_input_buffer.la 
    15  
     8bin_PROGRAMS = gst_test 
    169 
    1710gst_test_SOURCES = \ 

  • trunk/fm_server/src/fm_input_buffer/Makefile.in

    r276 r282  
    3434build_triplet = @build@ 
    3535host_triplet = @host@ 
    36 bin_PROGRAMS = buffer_test$(EXEEXT) gst_test$(EXEEXT) 
     36bin_PROGRAMS = gst_test$(EXEEXT) 
    3737subdir = src/fm_input_buffer 
    3838DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 
    … …  
    5959binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 
    6060PROGRAMS = $(bin_PROGRAMS) 
    61 am_buffer_test_OBJECTS = buffer_test.$(OBJEXT) 
    62 buffer_test_OBJECTS = $(am_buffer_test_OBJECTS) 
    63 buffer_test_DEPENDENCIES = libfm_input_buffer.la 
    6461am_gst_test_OBJECTS = gst_test.$(OBJEXT) 
    6562gst_test_OBJECTS = $(am_gst_test_OBJECTS) 
    … …  
    7875        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ 
    7976        $(LDFLAGS) -o $@ 
    80 SOURCES = $(libfm_input_buffer_la_SOURCES) $(buffer_test_SOURCES) \ 
    81         $(gst_test_SOURCES) 
    82 DIST_SOURCES = $(libfm_input_buffer_la_SOURCES) $(buffer_test_SOURCES) \ 
    83         $(gst_test_SOURCES) 
     77SOURCES = $(libfm_input_buffer_la_SOURCES) $(gst_test_SOURCES) 
     78DIST_SOURCES = $(libfm_input_buffer_la_SOURCES) $(gst_test_SOURCES) 
    8479ETAGS = etags 
    8580CTAGS = ctags 
    … …  
    248243        $(RGC_SERVER_CFLAGS) 
    249244 
    250 buffer_test_SOURCES = \ 
    251         buffer_test.c 
    252  
    253 buffer_test_LDADD = \ 
    254         libfm_input_buffer.la 
    255  
    256245gst_test_SOURCES = \ 
    257246        gst_test.c 
    … …  
    351340          rm -f $$p $$f ; \ 
    352341        done 
    353 buffer_test$(EXEEXT): $(buffer_test_OBJECTS) $(buffer_test_DEPENDENCIES)  
    354         @rm -f buffer_test$(EXEEXT) 
    355         $(LINK) $(buffer_test_OBJECTS) $(buffer_test_LDADD) $(LIBS) 
    356342gst_test$(EXEEXT): $(gst_test_OBJECTS) $(gst_test_DEPENDENCIES)  
    357343        @rm -f gst_test$(EXEEXT) 
    … …  
    364350        -rm -f *.tab.c 
    365351 
    366 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffer_test.Po@am__quote@ 
    367352@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_gst.Plo@am__quote@ 
    368353@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_input_buffer.Plo@am__quote@ 

  • trunk/fm_server/src/fm_input_cdj.c

    r280 r282  
    561561        fm_input_buffer_seek_direct (input_cdj->input, pos); 
    562562} 
     563 
     564 
     565static void 
     566fm_input_cdj_set_beatinfo               (FmInputCDJ     *input_cdj, 
     567                                         gint           n, 
     568                                         gint64         start, 
     569                                         gint64         stop, 
     570                                         gdouble        bpm) 
     571{ 
     572} 

  • trunk/rgc/include/server/rgc_marshal.h

    r144 r282  
    8282                                         gpointer       user_data); 
    8383 
     84/* VOID__INT_INT64_INT64_DOUBLE (../../src/server/rgc_marshalers.list:11) */ 
     85void rgc_marshal_VOID__INT_INT64_INT64_DOUBLE(GObject   *instance, 
     86                                         guint          n_param_values, 
     87                                         GValue         **param_values, 
     88                                         gpointer       marshal_data, 
     89                                         gpointer       user_data); 
     90 
    8491 
    8592G_END_DECLS 

  • trunk/rgc/src/server/rgc_marshal.c

    r281 r282  
    226226 
    227227 
    228 /* VOID__INT_INT64_INT64_DOUBLE (rgc_marshalers.list:11) */ 
    229 void rgc_marshal_VOID__INT_INT64_INT64_DOUBLE(GObject   *instance, 
    230                                          guint          n_param_values, 
    231                                          GValue         **param_values, 
    232                                          gpointer       marshal_data, 
    233                                          gpointer       user_data) 
    234 { 
    235         typedef void (*RgcMarshalFunc_VOID__INT_INT64_INT64_DOUBLE) (gpointer data1, gint arg1, gint64 arg2, gint64 arg3, gdouble arg4, gpointer data2); 
    236         register RgcMarshalFunc_VOID__INT_INT64_INT64_DOUBLE callback; 
    237         register gpointer data1; 
    238  
    239         g_return_if_fail (n_param_values == 4); 
    240  
    241         data1 = (gpointer) instance; 
    242  
    243         callback = (RgcMarshalFunc_VOID__INT_INT64_INT64_DOUBLE) (marshal_data); 
    244         callback (data1, g_marshal_value_peek_int (param_values[0]), g_marshal_value_peek_int64 (param_values[1]), g_marshal_value_peek_int64 (param_values[2]), g_marshal_value_peek_double (param_values[3]), user_data); 
    245 } 
    246  
    247