summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcoen Hirschberg <marcoen@gmail.com>2005-11-30 15:37:48 +0000
committerMarcoen Hirschberg <marcoen@gmail.com>2005-11-30 15:37:48 +0000
commit40d22093c011e2e9edc655f69fc911edbda3bcff (patch)
tree35750739f0e375fcd491791c1c9a4239e349c0d2
parentad31ad4d1ca9afac99ccd9dedb5052fdfc15f112 (diff)
downloadrockbox-40d22093c011e2e9edc655f69fc911edbda3bcff.tar.gz
rockbox-40d22093c011e2e9edc655f69fc911edbda3bcff.zip
revert scroll pause in continuous scrolling mode
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8115 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/drivers/lcd-16bit.c8
-rw-r--r--firmware/drivers/lcd-h100-remote.c8
-rw-r--r--firmware/drivers/lcd-h100.c8
-rw-r--r--firmware/drivers/lcd-recorder.c8
4 files changed, 12 insertions, 20 deletions
diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c
index 4ec9ddbac9..a4ae6cd553 100644
--- a/firmware/drivers/lcd-16bit.c
+++ b/firmware/drivers/lcd-16bit.c
@@ -765,11 +765,9 @@ static void scroll_thread(void)
}
}
else {
- /* pause at beginning of line */
- if (s->offset >= s->width) {
- s->offset = 0;
- s->start_tick = current_tick + scroll_delay * 2;
- }
+ /* scroll forward the whole time */
+ if (s->offset >= s->width)
+ s->offset %= s->width;
}
lastmode = drawmode;
diff --git a/firmware/drivers/lcd-h100-remote.c b/firmware/drivers/lcd-h100-remote.c
index 98da42710f..33a8b3790d 100644
--- a/firmware/drivers/lcd-h100-remote.c
+++ b/firmware/drivers/lcd-h100-remote.c
@@ -1323,11 +1323,9 @@ static void scroll_thread(void)
}
}
else {
- /* pause at beginning of line */
- if (s->offset >= s->width) {
- s->offset = 0;
- s->start_tick = current_tick + scroll_delay * 2;
- }
+ /* scroll forward the whole time */
+ if (s->offset >= s->width)
+ s->offset %= s->width;
}
lastmode = drawmode;
diff --git a/firmware/drivers/lcd-h100.c b/firmware/drivers/lcd-h100.c
index 739e4b2862..ba959d23de 100644
--- a/firmware/drivers/lcd-h100.c
+++ b/firmware/drivers/lcd-h100.c
@@ -1236,11 +1236,9 @@ static void scroll_thread(void)
}
}
else {
- /* pause at beginning of line */
- if (s->offset >= s->width) {
- s->offset = 0;
- s->start_tick = current_tick + scroll_delay * 2;
- }
+ /* scroll forward the whole time */
+ if (s->offset >= s->width)
+ s->offset %= s->width;
}
lastmode = drawmode;
diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-recorder.c
index a29257342e..7e064b8001 100644
--- a/firmware/drivers/lcd-recorder.c
+++ b/firmware/drivers/lcd-recorder.c
@@ -1065,11 +1065,9 @@ static void scroll_thread(void)
}
}
else {
- /* pause at beginning of line */
- if (s->offset >= s->width) {
- s->offset = 0;
- s->start_tick = current_tick + scroll_delay * 2;
- }
+ /* scroll forward the whole time */
+ if (s->offset >= s->width)
+ s->offset %= s->width;
}
lastmode = drawmode;