Attachment 315592 Details for Bug 460956 – cheese-2.23.90-sort-resolutions.patch

[patch] cheese-2.23.90-sort-resolutions.patch

cheese-2.23.90-sort-resolutions.patch (text/plain), 1.65 KB, created by Hans de Goede on 2008-09-02 20:21:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hans de Goede

Created: 2008-09-02 20:21:14 UTC

Size: 1.65 KB

patch

obsolete

>diff -up cheese-2.23.90/src/cheese-webcam.c.qwerty cheese-2.23.90/src/cheese-webcam.c
>--- cheese-2.23.90/src/cheese-webcam.c.qwerty	2008-09-02 19:41:29.000000000 +0200
>+++ cheese-2.23.90/src/cheese-webcam.c	2008-09-02 20:01:33.000000000 +0200
>@@ -486,6 +486,17 @@ cheese_webcam_add_video_format (CheeseWe
>   webcam_device->num_video_formats++;
> }
> 
>+static gint cheese_resolution_compare(gconstpointer _a, gconstpointer _b)
>+{
>+  const CheeseVideoFormat *a = _a;
>+  const CheeseVideoFormat *b = _b;
>+
>+  if (a->width == b->width)
>+    return a->height - b->height;
>+
>+  return a->width - b->width;
>+}
>+
> static void
> cheese_webcam_get_supported_video_formats (CheeseWebcamDevice *webcam_device, GstCaps *caps)
> {
>@@ -564,6 +575,20 @@ cheese_webcam_get_supported_video_format
>       g_critical ("GValue type %s, cannot be handled for resolution width", G_VALUE_TYPE_NAME (width));
>     }
>   }
>+  
>+  /* Sort the format array (so that it will show sorted in the resolution
>+     selection GUI), and rebuild the hashtable (as that will be invalid after
>+     the sorting) */
>+  g_array_sort (webcam_device->video_formats, cheese_resolution_compare);
>+  g_hash_table_remove_all (webcam_device->supported_resolutions);
>+  for (i = 0; i < webcam_device->num_video_formats; i++) {
>+    CheeseVideoFormat *format = &g_array_index(webcam_device->video_formats,
>+                                               CheeseVideoFormat, i);
>+    g_hash_table_insert (webcam_device->supported_resolutions, 
>+                         g_strdup_printf ("%ix%i", format->width,
>+                                          format->height), 
>+                         GINT_TO_POINTER(i + 1));
>+  }
> }
> 
> static void

Actions: View | Diff

Attachments on bug 460956: 315587 | 315588 | 315589 | 315590 | 315591 | 315592