[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdemultimedia/kscd/libwm/include
From:       Alex Kern <alex.kern () gmx ! de>
Date:       2004-07-03 19:22:56
Message-ID: 20040703192256.B417899D0 () office ! kde ! org
[Download RAW message or body]

CVS commit by kernalex: 

Update of CDDA, now it works without glitches


  M +33 -25    wm_cdda.h   1.12


--- kdemultimedia/kscd/libwm/include/wm_cdda.h  #1.11:1.12
@@ -31,5 +31,4 @@
 struct cdda_block {
         unsigned char status;
-        unsigned char command;
         unsigned char track;
         unsigned char index;
@@ -37,4 +36,19 @@ struct cdda_block {
 
         int frame;
+    char *buf;
+    long  buflen;
+};
+
+struct cdda_device {
+    int        fd;
+    const char *devname;
+  
+    unsigned char status;
+    unsigned char track;
+    unsigned char index;
+    unsigned char command;
+  
+    int frame;
+    int frames_at_once;
 
         /* Average volume levels, for level meters */
@@ -47,12 +61,7 @@ struct cdda_block {
         /* Current balance setting (0-255, 128 = balanced) */
         unsigned char balance;
-};
 
-struct cdda_device {
-  int        fd;
-  const char *devname;
-  char       *buf;
-  long       buflen;
-  struct cdda_block *block;
+    struct cdda_block *blocks;
+    int numblocks;
 };
 
@@ -159,5 +168,5 @@ void cdda_set_loudness(struct wm_drive *
 
 
-int wmcdda_init(struct cdda_device*, struct cdda_block *block);
+int wmcdda_init(struct cdda_device*);
 int wmcdda_open(const char*);
 int wmcdda_close(struct cdda_device*);
@@ -166,5 +175,4 @@ long wmcdda_read(struct cdda_device*, st
 void wmcdda_speed(int speed);
 void wmcdda_direction(int newdir);
-long wmcdda_normalize(struct cdda_device*, struct cdda_block *block);
 
 #else


[prev in list] [next in list] [prev in thread] [next in thread]