2 files changed, 17 insertions, 33 deletions
diff --git a/kscd/libwm/include/wm_config.h b/kscd/libwm/include/wm_config.h
index caf7d17e..a2f2640a 100644
--- a/kscd/libwm/include/wm_config.h
+++ b/kscd/libwm/include/wm_config.h
@@ -45,7 +45,6 @@
  * Linux
  * News  (Sony NewsOS)
  * OpenBSD
- * OSF1
  * Sun (SunOS/Solaris, Sparc or x86)
  * SVR4
  * Ultrix
@@ -288,22 +287,6 @@
 #endif
 
 /******************************************************************
- * OSF1
- ******************************************************************
- ****    ****    ***      ***  ***  *******************************
- ***  **  **  ******  ******  **    *******************************
- ***  **  ****  ****    ***  *****  *******************************
- ***  **  ******  **  ****  ******  *******************************
- ****    ****    ***  ***  *****      *****************************
- ******************************************************************/
-#if defined(__osf__) || defined(__osf)
-
-/* not needed here, it's figured out by plat_osf1.c */
-/* #define DEFAULT_CD_DEVICE "/dev/rcdrom/cd0" */
-
-#endif
-
-/******************************************************************
  * SunOS/Solaris
  ******************************************************************
  ****    ***  **  **   ***  ***************************************
diff --git a/kscd/libwm/include/wm_struct.h b/kscd/libwm/include/wm_struct.h
index 71afce07..4369c925 100644
--- a/kscd/libwm/include/wm_struct.h
+++ b/kscd/libwm/include/wm_struct.h
@@ -104,33 +104,34 @@ struct wm_cdinfo
 /* The global variable "cd" points to the struct for the CD that's playing. */
 extern struct wm_cdinfo *cd;
 
-extern struct wm_playlist *new_playlist();
+extern struct wm_playlist *new_playlist(struct wm_cdinfo*, char*);
 
 #define WM_STR_GENVENDOR "Generic"
 #define WM_STR_GENMODEL  "drive"
 #define WM_STR_GENREV    "type"
 
+struct wm_drive;
 
 /*
  * Drive descriptor structure.  Used for access to low-level routines.
  */
 struct wm_drive_proto
 {
-  int (*gen_init)();
-  int (*gen_close)();
-  int (*gen_get_trackcount)();
-  int (*gen_get_cdlen)();
-  int (*gen_get_trackinfo)();
-  int (*gen_get_drive_status)();
-  int (*gen_get_volume)();
-  int (*gen_set_volume)();
-  int (*gen_pause)();
-  int (*gen_resume)();
-  int (*gen_stop)();
-  int (*gen_play)();
-  int (*gen_eject)();
-  int (*gen_closetray)();
-  int (*gen_get_cdtext)();
+  int (*gen_init)(struct wm_drive*);
+  int (*gen_close)(struct wm_drive*);
+  int (*gen_get_trackcount)(struct wm_drive*, int*);
+  int (*gen_get_cdlen)(struct wm_drive*, int*);
+  int (*gen_get_trackinfo)(struct wm_drive*, int, int*, int*);
+  int (*gen_get_drive_status)(struct wm_drive*, int, int*, int*, int*, int*);
+  int (*gen_get_volume)( struct wm_drive*, int*, int*);
+  int (*gen_set_volume)( struct wm_drive*, int, int);
+  int (*gen_pause)(struct wm_drive*);
+  int (*gen_resume)(struct wm_drive*);
+  int (*gen_stop)(struct wm_drive*);
+  int (*gen_play)(struct wm_drive*, int, int, int);
+  int (*gen_eject)(struct wm_drive*);
+  int (*gen_closetray)(struct wm_drive*);
+  int (*gen_get_cdtext)(struct wm_drive*, unsigned char**, int*);
 };
 
 struct wm_drive