← Back to branch summary

~ubuntu-branches/ubuntu/lucid/gnome-media/lucid

« back to all changes in this revision

Viewing changes to gst-mixer/src/preferences.c

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-03-17 19:15:41 UTC
  • mfrom: (0.1.28 upstream)
  • Revision ID: james.westby@ubuntu.com-20090317191541-0q416utvg9uokcuv
Tags: 2.26.0-0ubuntu1
https://launchpad.net/bugs/344481
* New upstream version (LP: #344481):
  + gnome-volume-control:
    - Fix tooltip when dB changes.
    - Update the volume immediately.
  + gst-mixer:
    - Add new icon mappings.
    - Make options update when changed.
    - Add sound theme page.
* debian/patches/05_gst-mix_and_new_gvc_no_conflict.patch:
  - Make it possible to build the new gnome-volume-control and
    gst-mixer at the same time without conflicting, by
    renaming the new gnome-volume-control capplet to
    gnome-volume-control-settings.
* debian/patches/06_autoconf.patch:
  - Recreate build system.
* debian/control{.in},
  debian/gnome-media-common.install,
  debian/gnome-media.install,
  debian/gnome-volume-control.install,
  debian/rules:
  - Enable the new gnome-volume-control capplet and gvc-applet
    and install these in to a new binary package - 
    gnome-volume-control-pulse.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gst-mixer/src/preferences.c
39
39
  COL_LABEL,
40
40
  COL_TRACK,
41
41
  COL_TYPE,
 
42
  COL_PAGE,
42
43
  NUM_COLS
43
44
};
44
45
 
81
82
static gint
82
83
sort_by_page_num (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data)
83
84
{
84
 
        GstMixerTrack *a_track, *b_track;
85
 
 
86
 
        gtk_tree_model_get (model, a, COL_TRACK, &a_track, -1);
87
 
        gtk_tree_model_get (model, b, COL_TRACK, &b_track, -1);
88
 
 
89
 
        return get_page_num (a_track) - get_page_num (b_track);
 
85
        gint a_type, b_type;
 
86
 
 
87
        gtk_tree_model_get (model, a, COL_PAGE, &a_type, -1);
 
88
        gtk_tree_model_get (model, b, COL_PAGE, &b_type, -1);
 
89
 
 
90
        return (a_type - b_type);
90
91
}
91
92
 
92
93
static void
122
123
  gtk_widget_show (label);
123
124
 
124
125
  store = gtk_list_store_new (NUM_COLS, G_TYPE_BOOLEAN,
125
 
                              G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_STRING);
 
126
                              G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_STRING,
 
127
                              G_TYPE_INT);
126
128
  gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (store), sort_by_page_num, NULL, NULL);
127
129
  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store), GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_ASCENDING);
128
130
  prefs->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
291
293
  GtkTreeIter iter;
292
294
  GtkListStore *store;
293
295
  const GList *item;
294
 
  gvc_whitelist list[] = whitelist_init_list;
 
296
  gint pgnum;
295
297
 
296
298
  g_return_if_fail (GST_IS_MIXER (element));
297
299
  mixer = GST_MIXER (element);
312
314
    GstMixerTrack *track = item->data;
313
315
    gchar *key = get_gconf_key (mixer, track);
314
316
    GConfValue *value;
315
 
    gboolean active = gnome_volume_control_element_whitelist (track, list);
 
317
    gboolean active = gnome_volume_control_element_whitelist (track);
316
318
 
317
319
    if ((value = gconf_client_get (prefs->client, key, NULL)) != NULL &&
318
320
        value->type == GCONF_VALUE_BOOL) {
320
322
    }
321
323
    g_free (key);
322
324
 
 
325
    pgnum = get_page_num (track);
323
326
    gtk_list_store_append (store, &iter);
324
327
    gtk_list_store_set (store, &iter,
325
328
                        COL_ACTIVE, active,
326
329
                        COL_LABEL, track->label,
327
330
                        COL_TRACK, track,
328
 
                        COL_TYPE, get_page_description (get_page_num (track)),
 
331
                        COL_TYPE, get_page_description (pgnum),
 
332
                        COL_PAGE, pgnum,
329
333
                        -1);
330
334
  }
331
335
}