Merge branch 'dbtool_preselect'
authorAndre <maan@p133.(none)>
Tue, 21 Feb 2006 08:22:36 +0000 (09:22 +0100)
committerAndre <maan@p133.(none)>
Tue, 21 Feb 2006 08:22:36 +0000 (09:22 +0100)
1  2 
db.h
server.c

diff --cc db.h
Simple merge
diff --cc server.c
+++ b/server.c
@@@ -63,14 -63,11 +63,16 @@@ extern struct audio_format afl[]
  /** the list of supported database tools */
  struct dbtool dblist[] = {
        {
 -              .name = "dopey",
 -              .init = dopey_dbtool_init,
 +              .name = "random",
 +              .init = random_dbtool_init,
 +              .update_audio_file = NULL,
 +      },
 +      {
 +              .name = "plm",
 +              .init = plm_dbtool_init,
                .update_audio_file = NULL,
+               .pre_select = NULL,
+               .post_select = NULL,
        },
  #ifdef HAVE_MYSQL
        {