Changeset 121

Show
Ignore:
Timestamp:
09/09/06 23:12:15 (5 years ago)
Author:
ath
Message:

Start the implementation of FmSongDB.

Location:
fm_server/trunk
Files:
5 added
6 modified

Legend:

Unmodified
Added
Removed
  • fm_server/trunk/configure

    r117 r121  
    2835928359 
    2836028360 
    28361                                                             ac_config_files="$ac_config_files Makefile intl/Makefile po/Makefile.in src/Makefile src/fm_input_gst/Makefile test/Makefile" 
     28361                                                                      ac_config_files="$ac_config_files Makefile intl/Makefile po/Makefile.in src/Makefile src/fm_input_gst/Makefile src/fm_song_db/Makefile test/Makefile" 
    2836228362cat >confcache <<\_ACEOF 
    2836328363# This file is a shell script that caches the results of configure 
     
    2895628956  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; 
    2895728957  "src/fm_input_gst/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/fm_input_gst/Makefile" ;; 
     28958  "src/fm_song_db/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/fm_song_db/Makefile" ;; 
    2895828959  "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; 
    2895928960  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; 
  • fm_server/trunk/configure.in

    r117 r121  
    184184src/Makefile 
    185185src/fm_input_gst/Makefile 
     186src/fm_song_db/Makefile 
    186187test/Makefile 
    187188]) 
  • fm_server/trunk/libtool

    r117 r121  
    8686 
    8787# LTCC compiler flags. 
    88 LTCFLAGS="-g -O2" 
     88LTCFLAGS="-O0 -g -Wall" 
    8989 
    9090# A language-specific compiler. 
     
    72657265 
    72667266# LTCC compiler flags. 
    7267 LTCFLAGS="-g -O2" 
     7267LTCFLAGS="-O0 -g -Wall" 
    72687268 
    72697269# A language-specific compiler. 
  • fm_server/trunk/src/Makefile.am

    r118 r121  
    22 
    33 
    4 SUBDIRS = fm_input_gst 
     4SUBDIRS = fm_input_gst fm_song_db 
    55 
    66 
     
    5555fm_server_LDADD = \ 
    5656        $(FM_SERVER_LIBS) \ 
    57         fm_input_gst/libfm_input_gst.la 
     57        fm_input_gst/libfm_input_gst.la \ 
     58        fm_song_db/libfm_song_db.la 
    5859 
    5960 
  • fm_server/trunk/src/Makefile.in

    r118 r121  
    9090@HAVE_JACK_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) 
    9191fm_server_DEPENDENCIES = $(am__DEPENDENCIES_1) \ 
    92         fm_input_gst/libfm_input_gst.la $(am__DEPENDENCIES_2) \ 
    93         $(am__DEPENDENCIES_3) 
     92        fm_input_gst/libfm_input_gst.la fm_song_db/libfm_song_db.la \ 
     93        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) 
    9494DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) 
    9595depcomp = $(SHELL) $(top_srcdir)/depcomp 
     
    265265sysconfdir = @sysconfdir@ 
    266266target_alias = @target_alias@ 
    267 SUBDIRS = fm_input_gst 
     267SUBDIRS = fm_input_gst fm_song_db 
    268268INCLUDES = $(FM_SERVER_CFLAGS) 
    269269fm_server_SOURCES = main.c types.h fm_utils.c fm_utils.h \ 
     
    279279fm_server_INCLUDES = $(am__append_2) $(am__append_5) 
    280280fm_server_LDADD = $(FM_SERVER_LIBS) fm_input_gst/libfm_input_gst.la \ 
    281         $(am__append_3) $(am__append_6) 
     281        fm_song_db/libfm_song_db.la $(am__append_3) $(am__append_6) 
    282282all: all-recursive 
    283283 
  • fm_server/trunk/src/fm_level_meter.c

    r120 r121  
    8383fm_level_meter_class_init               (FmLevelMeterClass *class) 
    8484{ 
    85         GObjectClass *gobject_class = G_OBJECT_CLASS (class); 
     85//      GObjectClass *gobject_class = G_OBJECT_CLASS (class); 
    8686        FmElementClass *element_class = FM_ELEMENT_CLASS (class); 
    8787//      FmEffectClass *effect_class = FM_EFFECT_CLASS (class);