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

List:       kde-commits
Subject:    kdemultimedia/kscd/libwm
From:       alex kern <alex.kern () gmx ! de>
Date:       2003-10-08 19:38:20
[Download RAW message or body]

CVS commit by kernalex: 

white space reording, debug improvements


  M +5 -10     cdda.c   1.2
  M +9 -3      cdrom.c   1.24


--- kdemultimedia/kscd/libwm/cdda.c  #1.1:1.2
@@ -39,7 +39,5 @@ cdda_get_drive_status( struct wm_drive *
 {
   if (d->cdda_slave > -1) {
-    unsigned char cmd[1] = { 'I' };
-
-    write(d->cdda_slave, cmd, 1);
+    write(d->cdda_slave, "I", 1);
     cdda_get_ack(d->cdda_slave);
 
@@ -114,8 +112,7 @@ cdda_pause( struct wm_drive *d )
 {
   if (d->cdda_slave > -1) {
-    int dummy, mode = WM_CDM_PLAYING;
-    unsigned char cmd[1] = { 'A' };
+/*    int dummy, mode = WM_CDM_PLAYING;*/
 
-    write(d->cdda_slave, cmd, 1);
+    write(d->cdda_slave, "A", 1);
     cdda_get_ack(d->cdda_slave);
     /*
@@ -132,7 +129,6 @@ int
 cdda_stop( struct wm_drive *d )
 {
-  unsigned char cmd[1] = { 'S' };
   if (d->cdda_slave > -1) {
-    write(d->cdda_slave, cmd, 1);
+    write(d->cdda_slave, "S", 1);
     cdda_get_ack(d->cdda_slave);
 
@@ -150,7 +146,6 @@ int
 cdda_eject( struct wm_drive *d )
 {
-  unsigned char cmd[1] = { 'E' };
   if (d->cdda_slave > -1) {
-    write(d->cdda_slave, cmd, 1);
+    write(d->cdda_slave, "E", 1);
     cdda_get_ack(d->cdda_slave);
 

--- kdemultimedia/kscd/libwm/cdrom.c  #1.23:1.24
@@ -288,4 +288,6 @@ read_toc( void )
     thiscd.trk[i].track = i + 1;
     thiscd.trk[i].section = 0;
+    wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "track %i, start frame %i\n",
+      thiscd.trk[i].track, thiscd.trk[i].start);
   }
 
@@ -376,4 +378,8 @@ wm_cd_status( void )
     perror("WM gen_get_drive_status");
     return -1;
+  } else {
+    wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS,
+      "gen_det_drive_status returns status %s, track %i, frame %i\n",
+      gen_status(mode), thiscd.curtrack, cur_frame);
   }
 
@@ -449,5 +455,5 @@ wm_cd_status( void )
   }
   wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS,
-    "wm_cd_status returning %s\n", gen_status(wm_cur_cdmode));
+    "wm_cd_status returns %s\n", gen_status(wm_cur_cdmode));
   return wm_cur_cdmode;
 }


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