X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=db.h;h=578e4fd9f8ba33ef7626832cb58eb9655ee2d8cd;hp=3347d3ad239d5fd2d364c99083278f0b0b967a8e;hb=019a4caa2bf9232c7efd84ffe7424994de6358fb;hpb=c5517c98d28a74a89086b0641e3633d16eaf9df7

diff --git a/db.h b/db.h
index 3347d3ad..578e4fd9 100644
--- a/db.h
+++ b/db.h
@@ -16,16 +16,10 @@
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */
 
-/** \file db.h data structures common to all database tools */
+/** \file db.h data structures common to all audio file selectors */
 
 #include <sys/select.h>
 
-enum supported_dbtools {DBT_DOPEY,
-#ifdef HAVE_MYSQL
-	DBT_MYSQL,
-#endif
-	NUM_DBTOOLS
-};
 
 int find_audio_files(const char *dirname, int (*f)(const char *, const char *));
 
@@ -39,7 +33,7 @@ int find_audio_files(const char *dirname, int (*f)(const char *, const char *));
  *
  *
  */
-struct dbtool {
+struct audio_file_selector {
 /**
  * name name of this database tool
  */
@@ -55,13 +49,13 @@ const char *name;
  * again via the cdt command).
  *
  * If \a init() returns success (non-negative return value), it must have
- * initialized in all non-optional function pointers of the given dbtool
+ * initialized in all non-optional function pointers of the given selector
  * struct. Moreover, \a cmd_list must point to a NULL-terminated array which
  * holds the list of all commands that are supported by this database tool.
  */
-int (*init)(struct dbtool *self);
+int (*init)(struct audio_file_selector *self);
 /**
- * list of commands supported by this dbtool
+ * list of commands supported by this selector
  */
 struct server_command *cmd_list;
 /**
@@ -102,7 +96,7 @@ void (*shutdown)(void);
  * add file descriptors to fd_sets
  *
  * The pre_select function of the activated database tool gets called just
- * before para_server enters its main select loop. The dbtool may add its own
+ * before para_server enters its main select loop. The selector may add its own
  * file descriptors to the \a rfds or the \a wfds set.
  *
  * If a file descriptor was added, \a max_fileno must be increased by
@@ -120,11 +114,11 @@ int (*pre_select)(fd_set *rfds, fd_set *wfds);
  */
 void (*post_select)(fd_set *rfds, fd_set *wfds);
 /**
- * each dbtool has its private data pointer */
+ * each selector has its private data pointer */
 void *private_data;
 };
 
-int mysql_dbtool_init(struct dbtool*);
-int plm_dbtool_init(struct dbtool*);
-int random_dbtool_init(struct dbtool*);
+int mysql_selector_init(struct audio_file_selector*);
+int playlist_selector_init(struct audio_file_selector*);
+int random_selector_init(struct audio_file_selector*);