Attachment 50562 Details for Bug 118281

[patch] libipoddevice: iPod Nano Device Support

libipoddevice-0.3.3.patch (text/plain), 5.92 KB, created by Aaron Bockover on 2005-09-21 20:10:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aaron Bockover

Created: 2005-09-21 20:10:45 UTC

Size: 5.92 KB

patch

obsolete

>diff -urN ./ChangeLog ../libipoddevice-0.3.3/ChangeLog
>--- ./ChangeLog	2005-09-07 21:33:33.000000000 -0400
>+++ ../libipoddevice-0.3.3/ChangeLog	2005-09-21 15:20:22.000000000 -0400
>@@ -1,3 +1,15 @@
>+2005-09-21  Aaron Bockover  <aaron@aaronbock.net>
>+	
>+	* configure.ac: Version 0.3.3
>+
>+2005-09-08  Aaron Bockover  <aaron@aaronbock.net>
>+
>+	* src/ipod-device.c: Added iPod Nano model information to detection table
>+	and new GObject property for getting a string version of the model type
>+	name (i.e. MODEL_TYPE_NANO_WHITE -> "Nano (White)")
>+	* src/ipod-device.h: Added MODEL_TYPE_NANO_WHITE and MODEL_TYPE_NANO_BLACK,
>+	also PROP_DEVICE_MODEL_STRING
>+
> 2005-09-07  Aaron Bockover  <aaron@aaronbock.net>
> 
> 	* configure.ac: Version 0.3.2
>diff -urN ./configure ../libipoddevice-0.3.3/configure
>--- ./configure	2005-09-07 16:49:46.000000000 -0400
>+++ ../libipoddevice-0.3.3/configure	2005-09-21 15:20:51.000000000 -0400
>@@ -1825,7 +1825,7 @@
> 
> # Define the identity of the package.
>  PACKAGE=libipoddevice
>- VERSION=0.3.2
>+ VERSION=0.3.3
> 
> 
> cat >>confdefs.h <<_ACEOF
>diff -urN ./configure.ac ../libipoddevice-0.3.3/configure.ac
>--- ./configure.ac	2005-09-07 16:49:27.000000000 -0400
>+++ ../libipoddevice-0.3.3/configure.ac	2005-09-09 00:37:56.000000000 -0400
>@@ -3,7 +3,7 @@
> AC_INIT(src/ipod-device.c)
> AM_CONFIG_HEADER(config.h)
> AC_CONFIG_SRCDIR(src)
>-AM_INIT_AUTOMAKE(libipoddevice, 0.3.2)
>+AM_INIT_AUTOMAKE(libipoddevice, 0.3.3)
> 
> AM_MAINTAINER_MODE
> AC_PROG_CC
>diff -urN ./src/ipod-device.c ../libipoddevice-0.3.3/src/ipod-device.c
>--- ./src/ipod-device.c	2005-09-07 16:41:34.000000000 -0400
>+++ ../libipoddevice-0.3.3/src/ipod-device.c	2005-09-08 23:59:28.000000000 -0400
>@@ -110,12 +110,36 @@
> 	{"9724", GB / 2, MODEL_TYPE_SHUFFLE,     FOURTH_GENERATION},
> 	{"9725", GB,     MODEL_TYPE_SHUFFLE,     FOURTH_GENERATION},
> 	
>+	/* Nano / Fourth Generation */
>+	{"A004", GB * 2, MODEL_TYPE_NANO_WHITE,  FOURTH_GENERATION},
>+	{"A099", GB * 2, MODEL_TYPE_NANO_BLACK,  FOURTH_GENERATION},
>+	{"A005", GB * 4, MODEL_TYPE_NANO_WHITE,  FOURTH_GENERATION},
>+	{"A107", GB * 4, MODEL_TYPE_NANO_BLACK,  FOURTH_GENERATION},
>+	
> 	/* HP iPods, need contributions for this table */
> 	{"E436", 40 * GB, MODEL_TYPE_REGULAR, FOURTH_GENERATION},
> 	
> 	{NULL, 0, 0, 0}
> };
> 
>+static const gchar *ipod_model_name_table [] = {
>+	"Invalid",
>+	"Unknown",
>+	"Color",
>+	"Color U2",
>+	"Grayscale",
>+	"Grayscale U2",
>+	"Mini (Silver)",
>+	"Mini (Blue)",
>+	"Mini (Pink)",
>+	"Mini (Green)",
>+	"Mini (Gold)",
>+	"Shuffle",
>+	"Nano (White)",
>+	"Nano (Black)",
>+	NULL
>+};
>+
> #define g_free_if_not_null(o) \
>     if(o != NULL) {           \
>         g_free(o);            \
>@@ -254,6 +278,11 @@
> 			g_value_set_uint(value, 
> 				ipod_model_table[device->priv->model_index].model_type);
> 			break;
>+		case PROP_DEVICE_MODEL_STRING:
>+			g_value_set_string(value,
>+				ipod_model_name_table[ipod_model_table[
>+					device->priv->model_index].model_type]);
>+			break;
> 		case PROP_DEVICE_GENERATION:
> 			g_value_set_uint(value, 
> 				ipod_model_table[device->priv->model_index].generation);
>@@ -377,6 +406,7 @@
> 	GParamSpec *device_path_param;
> 	GParamSpec *control_path_param;
> 	GParamSpec *device_model_param;
>+	GParamSpec *device_model_string_param;
> 	GParamSpec *device_name_param;
> 	GParamSpec *user_name_param;
> 	GParamSpec *host_name_param;
>@@ -421,6 +451,10 @@
> 	device_model_param = g_param_spec_uint("device-model", "Device Model",
> 		"Type of iPod (Regular, Photo, Shuffle)", 0, 2, 0, G_PARAM_READABLE);
> 	
>+	device_model_string_param = g_param_spec_string("device-model-string",
>+		"Device Model String", "String type of iPod (Regular, Shuffle)",
>+		NULL, G_PARAM_READABLE);
>+	
> 	device_name_param = g_param_spec_string("device-name", "Device Name",
> 		"The user-assigned name of their iPod", NULL, G_PARAM_READWRITE);
> 		 
>@@ -504,6 +538,9 @@
> 	g_object_class_install_property(class, PROP_DEVICE_MODEL, 
> 		device_model_param);
> 		
>+	g_object_class_install_property(class, PROP_DEVICE_MODEL_STRING,
>+		device_model_string_param);
>+		
> 	g_object_class_install_property(class, PROP_DEVICE_NAME, 
> 		device_name_param);
> 		
>@@ -1496,22 +1533,7 @@
> 
> void
> ipod_device_debug(IpodDevice *device)
>-{
>-	static const gchar *model_type_names [] = {
>-		"Invalid",
>-		"Unknown",
>-		"Color",
>-		"Color U2",
>-		"Grayscale/Regular",
>-		"Grayscale/Regular U2",
>-		"Mini (Silver)",
>-		"Mini (Blue)",
>-		"Mini (Pink)",
>-		"Mini (Green)",
>-		"Mini (Gold)",
>-		"Shuffle"
>-	};
>-	
>+{	
> 	static const gchar *generation_names [] = {
> 		"Unknown",
> 		"First",
>@@ -1521,7 +1543,7 @@
> 	};
> 	
> 	gchar *device_path, *mount_point, *control_path, *hal_id;
>-	gchar *model_number, *adv_capacity;
>+	gchar *model_number, *adv_capacity, *model_string;
> 	guint model, generation;
> 	gboolean is_new, can_write;
> 	gchar *serial_number, *firmware_version;
>@@ -1538,6 +1560,7 @@
> 		"hal-volume-id", &hal_id,
> 		"model-number", &model_number,
> 		"device-model", &model,
>+		"device-model-string", &model_string,
> 		"device-generation", &generation,
> 		"advertised-capacity", &adv_capacity,
> 		"is-new", &is_new,
>@@ -1562,7 +1585,7 @@
> 	
> 	g_printf("Device Info\n");
> 	g_printf("   Model Number:     %s\n", model_number);
>-	g_printf("   Device Model:     %s\n", model_type_names[model]);
>+	g_printf("   Device Model:     %s\n", model_string);
> 	g_printf("   iPod Generation:  %s\n", generation_names[generation]);
> 	g_printf("   Adv. Capacity:    %s\n", adv_capacity);
> 	g_printf("   Is New:           %s\n", is_new ? "YES" : "NO");
>diff -urN ./src/ipod-device.h ../libipoddevice-0.3.3/src/ipod-device.h
>--- ./src/ipod-device.h	2005-08-24 12:05:57.000000000 -0400
>+++ ../libipoddevice-0.3.3/src/ipod-device.h	2005-09-08 23:57:12.000000000 -0400
>@@ -71,7 +71,9 @@
> 	MODEL_TYPE_MINI_PINK,
> 	MODEL_TYPE_MINI_GREEN,
> 	MODEL_TYPE_MINI_GOLD,
>-	MODEL_TYPE_SHUFFLE
>+	MODEL_TYPE_SHUFFLE,
>+	MODEL_TYPE_NANO_WHITE,
>+	MODEL_TYPE_NANO_BLACK
> };
> 
> enum {
>@@ -88,6 +90,7 @@
> 	PROP_DEVICE_PATH,
> 	PROP_CONTROL_PATH,
> 	PROP_DEVICE_MODEL,
>+	PROP_DEVICE_MODEL_STRING,
> 	PROP_DEVICE_GENERATION,
> 	PROP_ADVERTISED_CAPACITY,
> 	PROP_DEVICE_NAME,

Actions: View | Diff

Attachments on bug 118281: 50562 | 50563 | 50568 | 53898 | 53899