~blackskad/gnomeradio/dev-vol-button

« back to all changes in this revision

Viewing changes to src/prefs.c

  • Committer: mfcn
  • Date: 2008-04-13 14:30:58 UTC
  • Revision ID: svn-v3-trunk0:ba97a3d1-ec25-0410-b1c6-e06ad936ea6c:trunk:194
        * data/gnomeradio.schemas.in:
        * src/Makefile.am:
        * src/gui.c (initial_frequency_scan_cb), (initial_frequency_scan),
        (start_radio), (redraw_status_window), (adj_value_changed_cb):
        * src/gui.h:
        * src/prefs.c (save_settings), (load_settings):
        * src/radio.c (radio_init), (radio_is_init), (radio_stop),
        (radio_set_freq), (radio_unmute), (radio_mute), (radio_get_stereo),
        (radio_get_signal), (radio_check_station):
        * src/radio.h:
        * src/tech.c (mixer_get_volume):
        * src/tech.h:
        * src/v4l1.c (v4l1_radio_init), (v4l1_radio_is_init),
        (v4l1_radio_set_freq), (v4l1_radio_mute), (v4l1_radio_get_stereo),
        (v4l1_radio_get_signal), (v4l1_radio_finalize),
        (v4l1_radio_dev_new):
        * src/v4l1.h:
        * src/v4l2.c (v4l2_radio_init), (v4l2_radio_is_init),
        (v4l2_radio_set_freq), (v4l2_radio_mute), (v4l2_radio_get_stereo),
        (v4l2_radio_get_signal), (v4l2_radio_finalize),
        (v4l2_radio_dev_new):
        * src/v4l2.h:
        Refactored backend so that it supports both v4l and v4l2 and selection can
        be made at runtime. The v4l2 code is based on the patch contributed by
        James Henstridge (bug #429005).

Show diffs side-by-side

added added

removed removed

Lines of Context:
53
53
        
54
54
        /* Store general settings */
55
55
        gconf_client_set_string(client, "/apps/gnomeradio/device", settings.device, NULL);
 
56
        gconf_client_set_string(client, "/apps/gnomeradio/driver", settings.driver, NULL);
56
57
        gconf_client_set_string(client, "/apps/gnomeradio/mixer", settings.mixer, NULL);
57
58
        gconf_client_set_string(client, "/apps/gnomeradio/mixer-device", settings.mixer_dev, NULL);
58
59
        gconf_client_set_bool(client, "/apps/gnomeradio/mute-on-exit", settings.mute_on_exit, NULL);
112
113
        settings.device = gconf_client_get_string(client, "/apps/gnomeradio/device" , NULL);
113
114
        if (!settings.device)
114
115
                settings.device = g_strdup("/dev/radio");
 
116
        settings.driver = gconf_client_get_string(client, "/apps/gnomeradio/driver" , NULL);
 
117
        if (!settings.driver)
 
118
                settings.driver = g_strdup("any");
115
119
        settings.mixer = gconf_client_get_string(client, "/apps/gnomeradio/mixer", NULL);
116
120
        if (!settings.mixer)
117
121
                settings.mixer = g_strdup("line");