diff options
| author | gahr <gahr@FreeBSD.org> | 2008-07-05 02:14:46 +0800 |
|---|---|---|
| committer | gahr <gahr@FreeBSD.org> | 2008-07-05 02:14:46 +0800 |
| commit | eed5b2ed7039d1f5a805b33af061bd3ba0930262 (patch) | |
| tree | ef3f5a263d58e9f74884f89800c355bc149e6551 | |
| parent | 3bd42a269456c34d43072ec2bb904a5c00ed4c49 (diff) | |
| download | freebsd-ports-gnome-eed5b2ed7039d1f5a805b33af061bd3ba0930262.tar.gz freebsd-ports-gnome-eed5b2ed7039d1f5a805b33af061bd3ba0930262.tar.zst freebsd-ports-gnome-eed5b2ed7039d1f5a805b33af061bd3ba0930262.zip | |
- Fix stop command. Do not restart if play mode is set to repeat
- Refactor repeat track
- Bump portrevision
| -rw-r--r-- | audio/tcd/Makefile | 2 | ||||
| -rw-r--r-- | audio/tcd/files/patch-tcd.c | 38 |
2 files changed, 31 insertions, 9 deletions
diff --git a/audio/tcd/Makefile b/audio/tcd/Makefile index ad0aea3dbbf3..dcd385d48778 100644 --- a/audio/tcd/Makefile +++ b/audio/tcd/Makefile @@ -7,7 +7,7 @@ PORTNAME= tcd PORTVERSION= 2.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/audio/tcd/files/patch-tcd.c b/audio/tcd/files/patch-tcd.c index 226bab93d59c..5d583d476f58 100644 --- a/audio/tcd/files/patch-tcd.c +++ b/audio/tcd/files/patch-tcd.c @@ -1,5 +1,5 @@ --- src/tcd.c.orig 2004-06-15 22:32:31.000000000 +0200 -+++ src/tcd.c 2008-06-27 22:55:04.000000000 +0200 ++++ src/tcd.c 2008-07-04 20:09:09.000000000 +0200 @@ -33,6 +33,7 @@ #include <unistd.h> @@ -8,7 +8,19 @@ #include "cd-utils.h" #include "cddb.h" -@@ -179,6 +180,26 @@ +@@ -134,11 +135,6 @@ + } + } + +-static void handle_repeat_track(void) +-{ +- state.play_method = REPEAT_TRK; +-} +- + static void handle_eject(void) + { + SDL_CDEject(state.cdrom); +@@ -179,6 +175,26 @@ } } @@ -35,7 +47,7 @@ static void init_SDL(int cdrom_num) { int err = SDL_Init(SDL_INIT_CDROM); -@@ -217,11 +238,11 @@ +@@ -217,11 +233,11 @@ static void detect_disc_change(void) { unsigned long discid = cddb_discid(state.cdrom); @@ -49,7 +61,7 @@ state.current_discid = discid; } } -@@ -237,7 +258,7 @@ +@@ -237,7 +253,7 @@ state.play_method = NORMAL; init_SDL((argc > 1) ? strtol(argv[1], NULL, 0) : 0); @@ -58,12 +70,22 @@ tcd_ui_init(); tcd_ui_update(&state); state.current_discid = cddb_discid(state.cdrom); -@@ -262,6 +283,8 @@ - case 's': case 'S': handle_stop(); break; +@@ -255,13 +271,16 @@ + case '-': case '_': handle_prev_track(); break; + case 'g': case 'G': handle_goto(); break; + case 'c': case 'C': state.play_method = REPEAT_CD; break; +- case 'r': case 'R': handle_repeat_track(); break; ++ case 'r': case 'R': state.play_method = REPEAT_TRK; break; + case 'm': case 'M': handle_method(); break; + case 'e': case 'E': handle_eject(); break; + case 't': case 'T': handle_editor(); break; +- case 's': case 'S': handle_stop(); break; ++ case 's': case 'S': state.play_method = NORMAL; ++ handle_stop(); break; case ']': handle_skip_forward(); break; case '[': handle_skip_back(); break; -+ case '*': inc_volume(); break; -+ case '/': dec_volume(); break; ++ case '*': inc_volume(); break; ++ case '/': dec_volume(); break; } } tcd_ui_shutdown(); |