Merge with Scott

ChangeLog

@@ -1,5 +1,13 @@
 2005-10-15  Scott James Remnant  <scott@netsplit.com>
 
+	* TODO: Added notes of what I want fixed before release.
+
+	* src/main.c (main): Reset the state structure after connecting
+	to the stream, clearing out any previous event information so we
+	come at the new data fresh.
+	* src/packet.c (handle_system_packet): Reset the flag to green
+	at the start of a new event.
+
 	* src/stream.c (read_stream): Don't bomb out when our syscalls are
 	interrupted by signal, instead just come back later and carry on.
 	* src/display.c (should_quit): Rename to handle_keys, return < 0

TODO

@@ -0,0 +1,43 @@
+Before first release:
+
+ * Identify a way of noticing when we haven't got the right decryption
+   and bailing out -- instead of displaying junk.
+
+ * Replace numeric parsing code with something a little less primitive
+   and more robust.
+
+ * Make sure we handle an event starting while we're running
+   correctly; and don't end up displaying garbage.
+
+ * Less evil config-file code.
+
+ * Less evil "get user's registration details" code.
+
+ * Don't display the user's password while they type it.
+
+ * Registration within the client.
+
+ * Character set conversion for notices and such, so we display ®
+   instead of the block in the "no timing yet" message.
+
+ * Manual Page.
+
+
+Sometime after:
+
+ * Record/playback functionality for events that your TV provider
+   doesn't transmit live -- pause, fast forward and rewind within the
+   client too.  (Live Pause? :p)
+
+ * Do SOMETHING with the weather data, and position history data, just
+   displaying the current values isn't interesting; it's the trends
+   that matter.
+
+ * Keep the history of all the results for each driver, now we have a
+   pretty good idea what they all mean; allow the user to cursor to a
+   driver on the board and use PgUp/PgDn to scroll through the
+   history.
+
+ * Find somewhere to put the commentary.
+
+ * GTK+ ui?

debian/copyright

@@ -6,17 +6,13 @@ Packaged by Fabio M. Di Nitto <fabbione@ubuntu.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 dated June, 1991 or later.
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
 On Ubuntu / Debian GNU/Linux systems, the complete text of the GNU
 General Public License can be found in `/usr/share/common-licenses/GPL'.

src/main.c

@@ -161,6 +161,24 @@ main (int   argc,
 			return 2;
 		}
 
+		state->key = 0;
+		state->frame = 0;
+		state->event_no = 0;
+		state->event_type = RACE_EVENT;
+		state->epoch_time = 0;
+		state->remaining_time = 0;
+		state->lap = 0;
+		state->flag = GREEN_FLAG;
+		state->num_cars = 0;
+		if (state->car_position) {
+			free (state->car_position);
+			state->car_position = NULL;
+		}
+		if (state->car_info) {
+			free (state->car_info);
+			state->car_info = NULL;
+		}
+
 		reset_decryption (state);
 
 		while ((ret = read_stream (state, sock)) > 0) {

src/packet.c

@@ -175,6 +175,7 @@ handle_system_packet (CurrentState *state,
 		state->epoch_time = 0;
 		state->remaining_time = 0;
 		state->lap = 0;
+		state->flag = GREEN_FLAG;
 		state->num_cars = 0;
 		if (state->car_position) {
 			free (state->car_position);