[Pkg-wmaker-commits] [wmrack] 12/97: finished removing ugly (and somewhat broken) macros
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Sat Aug 22 02:41:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmrack.
commit 2d90b3237d458c9969691a174bc0d503d1a34a80
Author: Chris Waters <xtifr.w at gmail.com>
Date: Thu Mar 8 16:56:49 2012 -0800
finished removing ugly (and somewhat broken) macros
---
cdctrl.c | 102 ++++++++++++++++++++++----------------------
cdrom.c | 52 +++++++++++------------
cdrom.h | 7 +--
wmrack.c | 145 ++++++++++++++++++++++++++++++++-------------------------------
4 files changed, 151 insertions(+), 155 deletions(-)
diff --git a/cdctrl.c b/cdctrl.c
index a8e30ed..a874e53 100644
--- a/cdctrl.c
+++ b/cdctrl.c
@@ -1,5 +1,5 @@
/*
- * $Id: cdctrl.c,v 1.1.1.1 2001/02/12 22:25:33 xtifr Exp $
+ * $Id: cdctrl.c,v 1.1.1.1.2.1 2003/08/06 11:18:55 xtifr Exp $
*
* Part of WMRack
*
@@ -71,72 +71,72 @@ int main(int argc, char **argv)
switch (i)
{
case 0:
- printf("discid: %08lX\n",cd_info(cd,discid));
- printf("Tracks: %d\n",cd_info(cd,tracks));
- for (i=0; i<cd_info(cd,tracks); i++)
+ printf("discid: %08lX\n",cd->info.discid);
+ printf("Tracks: %d\n",cd->info.tracks);
+ for (i=0; i<cd->info.tracks; i++)
{
printf("%2d[%2d]: start(%02d:%02d:%02d) end(%02d:%02d:%02d) len(%02d:%02d:%02d) %s\n",i,
- cd_info(cd,track)[i].num,
- cd_info(cd,track)[i].start.minute,
- cd_info(cd,track)[i].start.second,
- cd_info(cd,track)[i].start.frame,
- cd_info(cd,track)[i].end.minute,
- cd_info(cd,track)[i].end.second,
- cd_info(cd,track)[i].end.frame,
- cd_info(cd,track)[i].length.minute,
- cd_info(cd,track)[i].length.second,
- cd_info(cd,track)[i].length.frame,
- cd_info(cd,track)[i].data?"DATA":"");
+ cd->info.track[i].num,
+ cd->info.track[i].start.minute,
+ cd->info.track[i].start.second,
+ cd->info.track[i].start.frame,
+ cd->info.track[i].end.minute,
+ cd->info.track[i].end.second,
+ cd->info.track[i].end.frame,
+ cd->info.track[i].length.minute,
+ cd->info.track[i].length.second,
+ cd->info.track[i].length.frame,
+ cd->info.track[i].data?"DATA":"");
}
showlist:
printf("PlayList: %d length(%02d:%02d:%02d)\n",
- cd_list(cd,tracks),
- cd_list(cd,length).minute,
- cd_list(cd,length).second,
- cd_list(cd,length).frame);
- for (i=0; i<cd_list(cd,tracks); i++)
+ cd->info.list.tracks,
+ cd->info.list.length.minute,
+ cd->info.list.length.second,
+ cd->info.list.length.frame);
+ for (i=0; i<cd->info.list.tracks; i++)
{
printf("%2d[%2d]: start(%02d:%02d:%02d) end(%02d:%02d:%02d) len(%02d:%02d:%02d) %s\n",i,
- cd_list(cd,track)[i].num,
- cd_list(cd,track)[i].start.minute,
- cd_list(cd,track)[i].start.second,
- cd_list(cd,track)[i].start.frame,
- cd_list(cd,track)[i].end.minute,
- cd_list(cd,track)[i].end.second,
- cd_list(cd,track)[i].end.frame,
- cd_list(cd,track)[i].length.minute,
- cd_list(cd,track)[i].length.second,
- cd_list(cd,track)[i].length.frame,
- cd_list(cd,track)[i].data?"DATA":"");
+ cd->info.list.track[i].num,
+ cd->info.list.track[i].start.minute,
+ cd->info.list.track[i].start.second,
+ cd->info.list.track[i].start.frame,
+ cd->info.list.track[i].end.minute,
+ cd->info.list.track[i].end.second,
+ cd->info.list.track[i].end.frame,
+ cd->info.list.track[i].length.minute,
+ cd->info.list.track[i].length.second,
+ cd->info.list.track[i].length.frame,
+ cd->info.list.track[i].data?"DATA":"");
}
break;
case 1:
printf("status is %d\n",status);
printf("mode %d track %d\n",
- cd_cur(cd,mode),cd_cur(cd,track));
- if (cd_cur(cd,track)!=-1)
+ cd->info.current.mode,cdinfo.current.track);
+ if (cd->info.current.track!=-1)
printf("%d[%d]: %02d:%02d:%02d->%02d:%02d:%02d len(%02d:%02d:%02d) d%d\n",
- cd_cur(cd,track),
- cd_list(cd,track)[cd_cur(cd,track)].num,
- cd_list(cd,track)[cd_cur(cd,track)].start.minute,
- cd_list(cd,track)[cd_cur(cd,track)].start.second,
- cd_list(cd,track)[cd_cur(cd,track)].start.frame,
- cd_list(cd,track)[cd_cur(cd,track)].end.minute,
- cd_list(cd,track)[cd_cur(cd,track)].end.second,
- cd_list(cd,track)[cd_cur(cd,track)].end.frame,
- cd_list(cd,track)[cd_cur(cd,track)].length.minute,
- cd_list(cd,track)[cd_cur(cd,track)].length.second,
- cd_list(cd,track)[cd_cur(cd,track)].length.frame,
- cd_list(cd,track)[cd_cur(cd,track)].data);
+ cd->info.current.track,
+ cd->info.list.track[cd->info.current.track].num,
+ cd->info.list.track[cd->info.current.track].start.minute,
+ cd->info.list.track[cd->info.current.track].start.second,
+ cd->info.list.track[cd->info.current.track].start.frame,
+ cd->info.list.track[cd->info.current.track].end.minute,
+ cd->info.list.track[cd->info.current.track].end.second,
+ cd->info.list.track[cd->info.current.track].end.frame,
+ cd->info.list.track[cd->info.current.track].length.minute,
+ cd->info.list.track[cd->info.current.track].length.second,
+ cd->info.list.track[cd->info.current.track].length.frame,
+ cd->info.list.track[cd->info.current.track].data);
else
printf("no current track\n");
printf("rel %02d:%02d:%02d abs %02d:%02d:%02d\n",
- cd_cur(cd,relmsf.minute),
- cd_cur(cd,relmsf.second),
- cd_cur(cd,relmsf.frame),
- cd_cur(cd,absmsf.minute),
- cd_cur(cd,absmsf.second),
- cd_cur(cd,absmsf.frame));
+ cd->info.current.relmsf.minute,
+ cd->info.current.relmsf.second,
+ cd->info.current.relmsf.frame,
+ cd->info.current.absmsf.minute,
+ cd->info.current.absmsf.second,
+ cd->info.current.absmsf.frame);
break;
case 2:
if (argc>2)
diff --git a/cdrom.c b/cdrom.c
index 996bad5..efd13cf 100644
--- a/cdrom.c
+++ b/cdrom.c
@@ -1,5 +1,5 @@
/*
- * $Id: cdrom.c,v 1.2 2001/02/14 10:23:35 xtifr Exp $
+ * $Id: cdrom.c,v 1.2.2.1 2003/08/06 11:18:55 xtifr Exp $
*
* cdrom utility functions for WMRack
*
@@ -295,7 +295,7 @@ int cd_reopen(CD *cd)
{
cd_resetpl(cd);
cd->status=cd_getStatus(cd,0,1);
- switch (cd_cur(cd,mode))
+ switch (cd->info.current.mode)
{
case CDM_PLAY:
cd->info.play.last_action=CDA_PLAY;
@@ -311,14 +311,14 @@ int cd_reopen(CD *cd)
cd->info.play.last_action=CDA_NONE;
break;
}
- start=cd->info.play.cur_track=cd_findtrack(cd,cd_cur(cd,track));
+ start=cd->info.play.cur_track=cd_findtrack(cd,cd->info.current.track);
/* do play list optimization:
* find the longest possible track sequence without jumps
*/
- for (track=cd_list(cd,track)[start].num, end=start+1;
- end<cd_list(cd,tracks) && track==cd_list(cd,track)[end].num-1;
- track=cd_list(cd,track)[end].num, end++);
+ for (track=cd->info.list.track[start].num, end=start+1;
+ end<cd->info.list.tracks && track==cd->info.list.track[end].num-1;
+ track=cd->info.list.track[end].num, end++);
end--;
cd->info.play.cur_end=end;
@@ -414,7 +414,7 @@ int cd_getStatus(CD *cd, int reopen, int force)
break;
case CDROM_AUDIO_PAUSED:
- if (cd_play(cd,last_action)!=CDA_STOP)
+ if (cd->info.play.last_action!=CDA_STOP)
{
cur->mode=CDM_PAUSE;
goto setpos;
@@ -436,17 +436,17 @@ int cd_getStatus(CD *cd, int reopen, int force)
cd->status=ret;
/*
- if (ret>0 && cur->track>cd_info(cd,tracks) && cur->mode!=CDM_EJECT)
+ if (ret>0 && cur->track>cd->info.tracks && cur->mode!=CDM_EJECT)
{
cd_doStop(cd);
im_stop=1;
}
*/
- switch (cd_play(cd,repeat_mode))
+ switch (cd->info.play.repeat_mode)
{
case CDR_NONE:
- if ((cd_play(cd,last_action)==CDA_PLAY && cur->mode!=CDM_PLAY)
+ if ((cd->info.play.last_action==CDA_PLAY && cur->mode!=CDM_PLAY)
/* this means: the user wants the cdrom to play,
* but the cdrom does not play */
|| cur->mode==CDM_COMP || im_stop)
@@ -454,24 +454,24 @@ int cd_getStatus(CD *cd, int reopen, int force)
#ifdef DEBUG
fprintf(stderr,"cd_getStatus[DEBUG]: switching to next track\n");
#endif
- cd_play(cd,cur_track)=cd_play(cd,cur_end)+1;
- if (cd_play(cd,cur_track)<cd_list(cd,tracks))
- cd_doPlay(cd,cd_play(cd,cur_track));
+ cd->info.play.cur_track=cd->info.play.cur_end+1;
+ if (cd->info.play.cur_track<cd->info.list.tracks)
+ cd_doPlay(cd,cd->info.play.cur_track);
else
cd_doStop(cd);
}
break;
case CDR_ALL:
- if ((cd_play(cd,last_action)==CDA_PLAY && cur->mode!=CDM_PLAY)
+ if ((cd->info.play.last_action==CDA_PLAY && cur->mode!=CDM_PLAY)
|| cur->mode==CDM_COMP || im_stop)
{
- cd_play(cd,cur_track)++;
- if (cd_play(cd,cur_track)>=cd_list(cd,tracks))
+ cd->info.play.cur_track++;
+ if (cd->info.play.cur_track>=cd->info.list.tracks)
{
#ifdef DEBUG
fprintf(stderr,"cd_getStatus[DEBUG]: repeating list\n");
#endif
- if (cd_play(cd,play_type)==CDP_RANDOM)
+ if (cd->info.play.play_type==CDP_RANDOM)
cd_randomize(cd);
cd_doPlay(cd,0);
}
@@ -480,18 +480,18 @@ int cd_getStatus(CD *cd, int reopen, int force)
#ifdef DEBUG
fprintf(stderr,"cd_getStatus[DEBUG]: switching to next track\n");
#endif
- cd_doPlay(cd,cd_play(cd,cur_track));
+ cd_doPlay(cd,cd->info.play.cur_track);
}
}
break;
case CDR_ONE:
- if ((cd_play(cd,last_action)==CDA_PLAY && cur->mode!=CDM_PLAY)
+ if ((cd->info.play.last_action==CDA_PLAY && cur->mode!=CDM_PLAY)
|| cur->mode==CDM_COMP || im_stop)
{
#ifdef DEBUG
fprintf(stderr,"cd_getStatus[DEBUG]: repeating track\n");
#endif
- cd_doPlay(cd,cd_play(cd,cur_track));
+ cd_doPlay(cd,cd->info.play.cur_track);
}
break;
}
@@ -521,9 +521,9 @@ int cd_doPlay(CD *cd, int start)
/* do play list optimization:
* find the longest possible track sequence without jumps
*/
- for (track=cd_list(cd,track)[start].num, end=start+1;
- end<cd_list(cd,tracks) && track==cd_list(cd,track)[end].num-1;
- track=cd_list(cd,track)[end].num, end++);
+ for (track=cd->info.list.track[start].num, end=start+1;
+ end<cd->info.list.tracks && track==cd->info.list.track[end].num-1;
+ track=cd->info.list.track[end].num, end++);
end--;
#ifdef DEBUG
@@ -677,7 +677,7 @@ int cd_doSkip(CD *cd, int secs)
if (cd==NULL || cd->fd<0)
return 1;
- end=cd_list(cd,track)[cd_play(cd,cur_end)].end;
+ end=cd->info.list.track[cd->info.play.cur_end].end;
start=cd->info.current.absmsf;
start.second+=secs;
start=normMSF(start);
@@ -803,7 +803,7 @@ int cd_resetpl(CD *cd)
cd->info.list.track[cd->info.list.tracks-1].length);
}
- cd_play(cd,play_type)=CDP_NORMAL;
+ cd->info.play.play_type=CDP_NORMAL;
#ifdef DEBUG
fprintf(stderr,"cd_resetpl[DEBUG]: cd playlist reseted\n");
@@ -900,7 +900,7 @@ int cd_randomize(CD *cd)
}
}
- cd_play(cd,play_type)=CDP_RANDOM;
+ cd->info.play.play_type=CDP_RANDOM;
#ifdef DEBUG
fprintf(stderr,"cd_randomize[DEBUG]: cd playlist randomized\n");
diff --git a/cdrom.h b/cdrom.h
index b334b21..fc14529 100644
--- a/cdrom.h
+++ b/cdrom.h
@@ -1,5 +1,5 @@
/*
- * $Id: cdrom.h,v 1.1.1.1.2.1 2001/06/17 07:21:36 xtifr Exp $
+ * $Id: cdrom.h,v 1.1.1.1.2.2 2003/08/06 11:18:55 xtifr Exp $
*
* Copyright (c) 1997 by Oliver Graf <ograf at fga.de>
*/
@@ -139,9 +139,4 @@ int cdpl_free(CDPlayList *list);
int cdpl_add(CDPlayList *list, CD *cd, int track);
int cdpl_reset(CDPlayList *list);
-#define cd_info(c,w) (c->info.##w)
-#define cd_cur(c,w) (c->info.current.##w)
-#define cd_play(c,w) (c->info.play.##w)
-#define cd_list(c,w) (c->info.list.##w)
-
#endif /* WMRACK_MIXER_H_ */
diff --git a/wmrack.c b/wmrack.c
index 4f8a1bb..0966331 100644
--- a/wmrack.c
+++ b/wmrack.c
@@ -1,5 +1,5 @@
/*
- * $Id: wmrack.c,v 1.2.2.1 2001/06/17 04:19:18 xtifr Exp $
+ * $Id: wmrack.c,v 1.2.2.2 2003/08/06 11:18:55 xtifr Exp $
*
* WMRack - WindowMaker Sound Control Panel
*
@@ -107,7 +107,7 @@ main (int argc, char *argv[])
cd = cd_open (CdDevice, noprobe);
if (cd_getStatus (cd, 0, 1) > 0)
{
- if (cd_list (cd, tracks) == 0)
+ if (cd->info.list.tracks == 0)
{
rack_popup ("DATA");
cd_suspend (cd);
@@ -503,44 +503,44 @@ mainLoop ()
switch (Event.xbutton.button)
{
case 1:
- if (cd_cur (cd, mode) == CDM_PLAY)
+ if (cd->info.current.mode == CDM_PLAY)
displaymode ^= 1;
break;
case 2:
- if (cd_cur (cd, mode) == CDM_PLAY)
+ if (cd->info.current.mode == CDM_PLAY)
displaymode ^= 2;
break;
case 3:
- switch (cd_play (cd, repeat_mode))
+ switch (cd->info.play.repeat_mode)
{
case CDR_NONE:
- cd_play (cd, repeat_mode) = CDR_ALL;
+ cd->info.play.repeat_mode = CDR_ALL;
break;
case CDR_ALL:
- cd_play (cd, repeat_mode) = CDR_ONE;
+ cd->info.play.repeat_mode = CDR_ONE;
break;
default:
- cd_play (cd, repeat_mode) = CDR_NONE;
+ cd->info.play.repeat_mode = CDR_NONE;
break;
}
- if (cd_play (cd, repeat_mode) == 2
- && cd_cur (cd, mode) == CDM_PLAY)
- start_track = cd_cur (cd, track);
+ if (cd->info.play.repeat_mode == 2
+ && cd->info.current.mode == CDM_PLAY)
+ start_track = cd->info.current.track;
break;
}
force_disp = 1;
}
else if (IN_CD_PLAY_BUTTON (Event))
{
- if (cd_cur (cd, mode) == CDM_PLAY
- || cd_cur (cd, mode) == CDM_PAUSE)
+ if (cd->info.current.mode == CDM_PLAY
+ || cd->info.current.mode == CDM_PAUSE)
cd_doPause (cd);
- else if (cd_cur (cd, mode) == CDM_EJECT)
+ else if (cd->info.current.mode == CDM_EJECT)
{
if (cd_getStatus (cd, 1, 0))
{
start_track = 0;
- if (cd_list (cd, tracks) == 0)
+ if (cd->info.list.tracks == 0)
{
rack_popup ("DATA");
cd_suspend (cd);
@@ -567,13 +567,13 @@ mainLoop ()
}
else if (IN_CD_STOP_BUTTON (Event))
{
- if (cd_cur (cd, mode) == CDM_PLAY
- || cd_cur (cd, mode) == CDM_PAUSE)
+ if (cd->info.current.mode == CDM_PLAY
+ || cd->info.current.mode == CDM_PAUSE)
{
cd_doStop (cd);
- start_track = cd_play (cd, cur_track);
+ start_track = cd->info.play.cur_track;
}
- else if (cd_cur (cd, mode) == CDM_EJECT)
+ else if (cd->info.current.mode == CDM_EJECT)
{
if (Event.xbutton.button == 3)
cd_doEject (cd);
@@ -582,7 +582,7 @@ mainLoop ()
if (cd_getStatus (cd, 1, 1))
{
start_track = 0;
- if (cd_list (cd, tracks) == 0)
+ if (cd->info.list.tracks == 0)
{
rack_popup ("DATA");
cd_suspend (cd);
@@ -611,7 +611,7 @@ mainLoop ()
}
else if (IN_CD_TRACK_WIDGET(Event))
{
- if (cd_cur (cd, mode) != CDM_STOP)
+ if (cd->info.current.mode != CDM_STOP)
break;
if (Event.xbutton.state & ControlMask)
{
@@ -864,36 +864,37 @@ mainLoop ()
if (IN_CD_PREV_BUTTON (Event)
&& Event.xbutton.time - press_time < 200)
{
- if (cd_cur (cd, mode) == CDM_PLAY
- || cd_cur (cd, mode) == CDM_PAUSE)
+ if (cd->info.current.mode == CDM_PLAY
+ || cd->info.current.mode == CDM_PAUSE)
{
- if (cd_cur (cd, relmsf.minute)
- || cd_cur (cd, relmsf.second) > 2)
- cd_doPlay (cd, cd_cur (cd, track));
+ if (cd->info.current.relmsf.minute
+ || cd->info.current.relmsf.second > 2)
+ cd_doPlay (cd, cd->info.current.track);
else
- cd_doPlay (cd, cd_cur (cd, track) - 1);
+ cd_doPlay (cd, cd->info.current.track - 1);
}
- else if (cd_cur (cd, mode) == CDM_STOP)
+ else if (cd->info.current.mode == CDM_STOP)
{
if (start_track > 0)
start_track--;
else
- start_track = cd_list (cd, tracks) - 1;
+ start_track = cd->info.list.tracks - 1;
}
}
else if (IN_CD_NEXT_BUTTON (Event)
&& Event.xbutton.time - press_time < 200)
{
- if (cd_cur (cd, mode) == CDM_PLAY
- || cd_cur (cd, mode) == CDM_PAUSE)
+ if (cd->info.current.mode == CDM_PLAY
+ || cd->info.current.mode == CDM_PAUSE)
{
- if (cd_cur (cd, track) < cd_list (cd, tracks) - 1)
- cd_doPlay (cd, cd_cur (cd, track) + 1);
+ if (cd->info.current.track <
+ cd->info.list.tracks - 1)
+ cd_doPlay (cd, cd->info.current.track + 1);
}
- else if (cd_cur (cd, mode) == CDM_STOP)
+ else if (cd->info.current.mode == CDM_STOP)
{
- if (start_track < cd_list (cd, tracks) - 1)
+ if (start_track < cd->info.list.tracks - 1)
start_track++;
else
start_track = 0;
@@ -919,7 +920,7 @@ mainLoop ()
/* now check for a pressed button */
if (press_time != -1)
{
- if (cd_cur (cd, mode) == CDM_PLAY)
+ if (cd->info.current.mode == CDM_PLAY)
{
when = getTime ();
if (when - press_time > 500)
@@ -1009,9 +1010,10 @@ paint_cd_led (int flash, int track[], int cdtime[])
XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
8 * track[1], 0, 8, 11, 24, 35);
- if (flash || cd_cur (cd, mode) != CDM_PAUSE)
+ if (flash || cd->info.current.mode != CDM_PAUSE)
{
- if (cd_cur (cd, mode) == CDM_PLAY || cd_cur (cd, mode) == CDM_PAUSE)
+ if (cd->info.current.mode == CDM_PLAY ||
+ cd->info.current.mode == CDM_PAUSE)
{
XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
((displaymode & 2) ? 94 : 98), 0, 4, 5, 3, 2);
@@ -1065,16 +1067,16 @@ paint_cd_led (int flash, int track[], int cdtime[])
}
XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
- (cd_play (cd, repeat_mode) != CDR_NONE ? 102 : 106), 0, 4,
+ (cd->info.play.repeat_mode != CDR_NONE ? 102 : 106), 0, 4,
5, 42, 2);
XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
- (cd_play (cd, repeat_mode) != CDR_NONE ? 102 : 106), 0, 4,
+ (cd->info.play.repeat_mode != CDR_NONE ? 102 : 106), 0, 4,
5, 42, 2);
XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
- (cd_play (cd, repeat_mode) == CDR_ONE ? 102 : 106), 6, 4,
+ (cd->info.play.repeat_mode == CDR_ONE ? 102 : 106), 6, 4,
5, 42, 8);
XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
- (cd_play (cd, repeat_mode) == CDR_ONE ? 102 : 106), 6, 4,
+ (cd->info.play.repeat_mode == CDR_ONE ? 102 : 106), 6, 4,
5, 42, 8);
}
else
@@ -1246,11 +1248,11 @@ redrawDisplay (int force_win, int force_disp)
switch (WMRack_Mode)
{
case MODE_CDPLAYER:
- if (cd_cur (cd, mode) != CDM_PAUSE
- && last_cdmode == cd_cur (cd, mode)
+ if (cd->info.current.mode != CDM_PAUSE
+ && last_cdmode == cd->info.current.mode
&& (st < 1
- || (last_time.minute == cd_cur (cd, relmsf.minute)
- && last_time.second == cd_cur (cd, relmsf.second)
+ || (last_time.minute == cd->info.current.relmsf.minute
+ && last_time.second == cd->info.current.relmsf.second
&& last_track == start_track)))
return;
break;
@@ -1265,22 +1267,22 @@ redrawDisplay (int force_win, int force_disp)
}
#ifdef DEBUG
- if (last_cdmode != cd_cur (cd, mode))
+ if (last_cdmode != cd->info.current.mode)
{
- fprintf (stderr, "wmrack: cur_cdmode %d\n", cd_cur (cd, mode));
+ fprintf (stderr, "wmrack: cur_cdmode %d\n", cd->info.current.mode);
}
#endif
- if (cd_cur (cd, mode) == CDM_STOP
- && cd_play (cd, last_action) == CDA_PLAY)
+ if (cd->info.current.mode == CDM_STOP
+ && cd->info.play.last_action == CDA_PLAY)
start_track = 0;
lastMixer = curMixer;
- last_cdmode = cd_cur (cd, mode);
+ last_cdmode = cd->info.current.mode;
if (st > 0)
{
- last_time = cd_cur (cd, relmsf);
+ last_time = cd->info.current.relmsf;
last_track = start_track;
}
else
@@ -1289,7 +1291,7 @@ redrawDisplay (int force_win, int force_disp)
last_track = -1;
}
- if (cd_cur (cd, mode) == CDM_PAUSE)
+ if (cd->info.current.mode == CDM_PAUSE)
{
time_t flash_time = time (NULL);
@@ -1328,30 +1330,29 @@ redrawDisplay (int force_win, int force_disp)
newRack = RACK_MIXER;
else
{
- switch (cd_cur (cd, mode))
+ switch (cd->info.current.mode)
{
case CDM_PAUSE:
newRack = RACK_PAUSE;
case CDM_PLAY:
- track[0] = cd_list (cd, track)[cd_cur (cd, track)].num / 10;
- track[1] = cd_list (cd, track)[cd_cur (cd, track)].num % 10;
+ track[0] = cd->info.list.track[cd->info.current.track].num / 10;
+ track[1] = cd->info.list.track[cd->info.current.track].num % 10;
switch (displaymode)
{
case 0:
- pos = cd_cur (cd, relmsf);
+ pos = cd->info.current.relmsf;
break;
case 1:
- pos = subMSF (cd_list (cd, track)[cd_cur (cd, track)].length,
- cd_cur (cd, relmsf));
+ pos = subMSF (cd->info.list.track[cd->info.current.track].length,
+ cd->info.current.relmsf);
break;
case 2:
- pos = subMSF (cd_cur (cd, absmsf),
- cd_info (cd, track)[0].start);
+ pos = subMSF (cd->info.current.absmsf,
+ cd->info.track[0].start);
break;
case 3:
- pos = subMSF (cd_info (cd, track)[cd_info (cd, tracks)
- - 1].end,
- cd_cur (cd, absmsf));
+ pos = subMSF (cd->info.track[cd->info.tracks - 1].end,
+ cd->info.current.absmsf);
break;
}
cdtime[0] = pos.minute / 10;
@@ -1363,20 +1364,20 @@ redrawDisplay (int force_win, int force_disp)
newRack = RACK_STOP;
if (newdisc)
{
- track[0] = cd_list (cd, tracks) / 10;
- track[1] = cd_list (cd, tracks) % 10;
+ track[0] = cd->info.list.tracks / 10;
+ track[1] = cd->info.list.tracks % 10;
}
else
{
- track[0] = cd_list (cd, track)[start_track].num / 10;
- track[1] = cd_list (cd, track)[start_track].num % 10;
+ track[0] = cd->info.list.track[start_track].num / 10;
+ track[1] = cd->info.list.track[start_track].num % 10;
}
if (playlist == NULL)
{
- cdtime[0] = cd_list (cd, length).minute / 10;
- cdtime[1] = cd_list (cd, length).minute % 10;
- cdtime[2] = cd_list (cd, length).second / 10;
- cdtime[3] = cd_list (cd, length).second % 10;
+ cdtime[0] = cd->info.list.length.minute / 10;
+ cdtime[1] = cd->info.list.length.minute % 10;
+ cdtime[2] = cd->info.list.length.second / 10;
+ cdtime[3] = cd->info.list.length.second % 10;
}
else
{
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmrack.git
More information about the Pkg-wmaker-commits
mailing list