J?rg Hohensohn | 1 Jan 19:33 2004
Picon
Picon

cvs: firmware/drivers button.c,1.40,1.41

Update of /cvsroot/rockbox/firmware/drivers
In directory sc8-pr-cvs1:/tmp/cvs-serv14378/firmware/drivers

Modified Files:
	button.c 
Log Message:
nicer handling of button_flip(), swap stored value, too, and avoid race condition

Index: button.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/button.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- button.c	20 Dec 2003 10:00:37 -0000	1.40
+++ button.c	1 Jan 2004 18:33:52 -0000	1.41
 <at>  <at>  -34,6 +34,7  <at>  <at> 
 struct event_queue button_queue;

 long last_keypress;
+static int lastbtn;
 #ifdef HAVE_RECORDER_KEYPAD
 static bool flipped; /* bottons can be flipped to match the LCD flip */
 #endif
 <at>  <at>  -59,7 +60,6  <at>  <at> 
 {
     static int tick = 0;
     static int count = 0;
-    static int lastbtn = 0;
     static int repeat_speed = REPEAT_INTERVAL_START;
(Continue reading)

J?rg Hohensohn | 1 Jan 19:35 2004
Picon
Picon

cvs: apps screens.c,1.36,1.37

Update of /cvsroot/rockbox/apps
In directory sc8-pr-cvs1:/tmp/cvs-serv14685/apps

Modified Files:
	screens.c 
Log Message:
on popular demand: flip screen now in F3 menu, instead of inverse

Index: screens.c
===================================================================
RCS file: /cvsroot/rockbox/apps/screens.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- screens.c	12 Dec 2003 13:34:27 -0000	1.36
+++ screens.c	1 Jan 2004 18:35:47 -0000	1.37
 <at>  <at>  -572,10 +572,9  <at>  <at> 
         int w,h;
         char* ptr;

-        ptr = str(LANG_F3_STATUS);
-        lcd_getstringsize(ptr,&w,&h);
         lcd_clear_display();

+        /* Scrollbar */
         lcd_putsxy(0, LCD_HEIGHT/2 - h*2, str(LANG_F3_SCROLL));
         lcd_putsxy(0, LCD_HEIGHT/2 - h, str(LANG_F3_BAR));
         lcd_putsxy(0, LCD_HEIGHT/2, 
 <at>  <at>  -583,6 +582,9  <at>  <at> 
         lcd_bitmap(bitmap_icons_7x8[Icon_FastBackward], 
(Continue reading)

J?rg Hohensohn | 2 Jan 08:48 2004
Picon
Picon

cvs: apps/plugins firmware_flash.c,1.7,1.8

Update of /cvsroot/rockbox/apps/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv17816/apps/plugins

Modified Files:
	firmware_flash.c 
Log Message:
checks relaxed again, to tolerate firmware 1.15-1.29 for recorders

Index: firmware_flash.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/firmware_flash.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- firmware_flash.c	15 Dec 2003 13:16:09 -0000	1.7
+++ firmware_flash.c	2 Jan 2004 07:48:02 -0000	1.8
 <at>  <at>  -44,11 +44,9  <at>  <at> 
 #define ID_PLAYER   2
 #define ID_REC_V2   3

-/* We should never check for ARCHOS_* defines in source code. We must
-   check for features/hardware that have been defined in config-*.h files.
-   This makes it easier for us to maintain portability. */
-#define A_SUPPORTED_PLATFORM 1
-
+/* Here I have to check for ARCHOS_* defines in source code, which is 
+   generally strongly discouraged. But here I'm not checking for a certain 
+   feature, I'm checking for the model itself. */
 #if defined(ARCHOS_PLAYER)
 #define FILE_TYPE "player"
(Continue reading)

J?rg Hohensohn | 2 Jan 11:12 2004
Picon
Picon

cvs: apps screens.c,1.37,1.38

Update of /cvsroot/rockbox/apps
In directory sc8-pr-cvs1:/tmp/cvs-serv6149/apps

Modified Files:
	screens.c 
Log Message:
oops, before code police arrests me: C++ style comment removed

Index: screens.c
===================================================================
RCS file: /cvsroot/rockbox/apps/screens.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- screens.c	1 Jan 2004 18:35:47 -0000	1.37
+++ screens.c	2 Jan 2004 10:12:45 -0000	1.38
 <at>  <at>  -625,7 +625,6  <at>  <at> 
                 global_settings.flip_display = !global_settings.flip_display;
                 button_set_flip(global_settings.flip_display);
                 lcd_set_flip(global_settings.flip_display);
-                //lcd_update(); /* need to refresh */
                 used = true;
                 break;

Linus Nielsen Feltzing | 4 Jan 01:37 2004
Picon
Picon

cvs: firmware id3.c,1.81,1.82

Update of /cvsroot/rockbox/firmware
In directory sc8-pr-cvs1:/tmp/cvs-serv19849/firmware

Modified Files:
	id3.c 
Log Message:
ID3v2.3 treats the global unsynch flag in a silly way, so we have to unsynch the whole tag before we can parse
the individual frames.

Index: id3.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/id3.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- id3.c	26 Oct 2003 12:53:21 -0000	1.81
+++ id3.c	4 Jan 2004 00:37:30 -0000	1.82
 <at>  <at>  -40,6 +40,7  <at>  <at> 

 #include "id3.h"
 #include "mp3data.h"
+#include "system.h"

 #define UNSYNC(b0,b1,b2,b3) (((b0 & 0x7F) << (3*7)) | \
                              ((b1 & 0x7F) << (2*7)) | \
 <at>  <at>  -108,12 +109,13  <at>  <at> 
     int (*ppFunc)(struct mp3entry*, char* tag, int bufferpos);
 };

-static int unsynchronize(char* tag, int len)
(Continue reading)

Linus Nielsen Feltzing | 4 Jan 01:45 2004
Picon
Picon

cvs: firmware id3.c,1.82,1.83

Update of /cvsroot/rockbox/firmware
In directory sc8-pr-cvs1:/tmp/cvs-serv21042/firmware

Modified Files:
	id3.c 
Log Message:
Got rid of the reset parameter to xxx_unsynched()

Index: id3.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/id3.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- id3.c	4 Jan 2004 00:37:30 -0000	1.82
+++ id3.c	4 Jan 2004 00:45:16 -0000	1.83
 <at>  <at>  -109,7 +109,7  <at>  <at> 
     int (*ppFunc)(struct mp3entry*, char* tag, int bufferpos);
 };

-static bool global_ff_found = false;
+static bool global_ff_found;

 static int unsynchronize(char* tag, int len, bool *ff_found)
 {
 <at>  <at>  -146,7 +146,7  <at>  <at> 
     return unsynchronize(tag, len, &ff_found);
 }

-static int read_unsynched(int fd, void *buf, int len, bool reset)
(Continue reading)

Daniel Stenberg | 4 Jan 14:30 2004
Picon
Picon

cvs: apps Makefile,1.58,1.59

Update of /cvsroot/rockbox/apps
In directory sc8-pr-cvs1:/tmp/cvs-serv29653

Modified Files:
	Makefile 
Log Message:
bring back the cat for the preprocessing of the app.lds file, since
Jörg got problems on cygwin with the previous "< file" approach.

Index: Makefile
===================================================================
RCS file: /cvsroot/rockbox/apps/Makefile,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- Makefile	12 Dec 2003 14:07:28 -0000	1.58
+++ Makefile	4 Jan 2004 13:30:16 -0000	1.59
 <at>  <at>  -101,7 +101,7  <at>  <at> 
 # MEM should be passed on to this makefile with the chosen memory size given
 # in number of MB
 $(LINKFILE): $(LDS)
-	 $(CC) -DMEMORYSIZE=$(MEM) $(INCLUDES) $(TARGET) $(DEFINES) -E -P - < $< >$ <at> 
+	 cat $< | $(CC) -DMEMORYSIZE=$(MEM) $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$ <at> 

 $(OBJDIR)/rockbox.elf : $(OBJS) $(LINKFILE) $(OBJDIR)/librockbox.a
 	$(CC) -Os -nostdlib -o $ <at>  $(OBJS) -L$(OBJDIR) -lrockbox -lgcc -L$(FIRMWARE) -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockbox.map

J?rg Hohensohn | 5 Jan 08:27 2004
Picon
Picon

cvs: apps/plugins firmware_flash.c,1.8,1.9

Update of /cvsroot/rockbox/apps/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv19424/apps/plugins

Modified Files:
	firmware_flash.c 
Log Message:
tolerate firmware v1.32 for a V2 Recorder

Index: firmware_flash.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/firmware_flash.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- firmware_flash.c	2 Jan 2004 07:48:02 -0000	1.8
+++ firmware_flash.c	5 Jan 2004 07:26:59 -0000	1.9
 <at>  <at>  -283,6 +283,10  <at>  <at> 
     {   /* it can be a FM or V2 recorder */
         return (platform_id == ID_FM || platform_id == ID_REC_V2);
     }
+    else if (version == 132)
+    {   /* seen on a V2 recorder */
+        return (platform_id == ID_REC_V2);
+    }
     else if (version >= 115 && version <= 129)
     {   /* the range of Recorders seen so far */
         return (platform_id == ID_RECORDER);

J?rg Hohensohn | 5 Jan 21:42 2004
Picon
Picon

cvs: apps main.c,1.82,1.83 screens.c,1.38,1.39 settings.c,1.179,1.180 sound_menu.c,1.42,1.43 status.c,1.48,1.49 wps.c,1.200,1.201

Update of /cvsroot/rockbox/apps
In directory sc8-pr-cvs1:/tmp/cvs-serv7155/apps

Modified Files:
	main.c screens.c settings.c sound_menu.c status.c wps.c 
Log Message:
Moved the low-level playback functionality into a new, separate module "mp3_playback". This e.g. allows
to export a memory playback API to the plugins, opens the door to games with sound, UI sounds, etc.

Index: main.c
===================================================================
RCS file: /cvsroot/rockbox/apps/main.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- main.c	15 Dec 2003 11:45:14 -0000	1.82
+++ main.c	5 Jan 2004 20:42:50 -0000	1.83
 <at>  <at>  -37,6 +37,7  <at>  <at> 
 #include "serial.h"
 #endif
 #include "mpeg.h"
+#include "mp3_playback.h"
 #include "main_menu.h"
 #include "thread.h"
 #include "settings.h"
 <at>  <at>  -78,7 +79,7  <at>  <at> 
     sleep(HZ/2);
     tree_init();
     playlist_init();
-    mpeg_init( global_settings.volume,
(Continue reading)

J?rg Hohensohn | 5 Jan 21:42 2004
Picon
Picon

cvs: firmware/export mp3_playback.h,NONE,1.1 mpeg.h,1.13,1.14

Update of /cvsroot/rockbox/firmware/export
In directory sc8-pr-cvs1:/tmp/cvs-serv7155/firmware/export

Modified Files:
	mpeg.h 
Added Files:
	mp3_playback.h 
Log Message:
Moved the low-level playback functionality into a new, separate module "mp3_playback". This e.g. allows
to export a memory playback API to the plugins, opens the door to games with sound, UI sounds, etc.

--- NEW FILE: mp3_playback.h ---
/***************************************************************************
 *             __________               __   ___.
 *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
 *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
 * $Id: mp3_playback.h,v 1.1 2004/01/05 20:42:50 hohensoh Exp $
 *
 * Code that has been in mpeg.c/h before, now creating an encapsulated play
 * data module, to be used by other sources than file playback as well.
 *
 * Copyright (C) 2004 by Linus Nielsen Feltzing
 *
 * All files in this archive are subject to the GNU General Public License.
 * See the file COPYING in the source tree root for full license agreement.
 *
 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
(Continue reading)


Gmane