1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
--- main.c.orig 1997-11-17 09:26:26 UTC
+++ main.c
@@ -35,11 +35,14 @@ extern struct termios old_ttyattr;
int main(int argc, char **argv)
{
char cmd[1];
+ int repetivity;
fd_set rset;
struct timeval stime;
/* Parse arguments */
- cd_device=DEVICE;
+ cd_device=getenv("CDROM");
+ if (cd_device==NULL)
+ cd_device=DEVICE;
if(argc>1 && !strcmp(argv[1],"-d"))
cd_device=argv[2];
else if(argc>1)
@@ -68,19 +71,20 @@ int main(int argc, char **argv)
while(1){
if(select(1,&rset,(fd_set *) 0,(fd_set *) 0,&stime)>0) {
- read(STDIN_FILENO,cmd,FD_SETSIZE);
-
+ getcommand(&cmd[0], &repetivity);
+
if(cmd[0]=='p'){message="play";play_track(1);}
else if(cmd[0]=='F'){message="next";next();}
else if(cmd[0]=='R'){message="prev";prev();}
- else if(cmd[0]=='f'){message="ff";ff();}
- else if(cmd[0]=='r'){message="rew";rew();}
+ else if(cmd[0]=='f'){message="ff";ff(repetivity);}
+ else if(cmd[0]=='r'){message="rew";rew(repetivity);}
else if(cmd[0]=='s'){message="stop";stop();}
- else if(cmd[0]=='e'){message="eject";eject();}
- else if(cmd[0]==' ') cdpause();
+ else if(cmd[0]=='E'){message="eject";eject();}
+ else if(cmd[0]==' ') cdsoftpause();
else if(cmd[0]=='+'){message="more vol";more_vol();}
else if(cmd[0]=='-'){message="less vol";less_vol();}
else if(cmd[0]=='q'){message="bye!";do_exit(0);}
+ else if(cmd[0]=='P') cdpause();
}
update_cdinfo();
move_up(5);
@@ -92,6 +96,36 @@ int main(int argc, char **argv)
exit(0);
}
+void getcommand(char *command, int *repetivity)
+{
+ static char stored_command;
+ int n;
+
+ fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK);
+
+ if (stored_command) {
+ *command=stored_command;
+ } else {
+ n=read(STDIN_FILENO,command,1);
+ if (n <= 0) {
+ *command='\0';
+ *repetivity=0;
+ return;
+ }
+ }
+
+ *repetivity=1;
+ while (read(STDIN_FILENO, &stored_command, 1) > 0) {
+ if (stored_command == *command) {
+ (*repetivity)++;
+ } else {
+ return;
+ }
+ }
+ stored_command='\0';
+ return;
+}
+
void hs_cont(void)
{
init_term();
|
