comparison src/OSS4/init.c @ 1245:a18b7cdc505d

stripped down the config dialog, added an option for the save dmix volume between sessions and added myself to the credits
author Cristi Magherusan <majeru@atheme-project.org>
date Thu, 12 Jul 2007 19:42:32 +0300
parents d0f1e147cf62
children b8da6a0b0da2
comparison
equal deleted inserted replaced
1244:d0f1e147cf62 1245:a18b7cdc505d
33 ConfigDb *db; 33 ConfigDb *db;
34 34
35 memset(&oss_cfg, 0, sizeof(OSSConfig)); 35 memset(&oss_cfg, 0, sizeof(OSSConfig));
36 36
37 oss_cfg.audio_device = 0; 37 oss_cfg.audio_device = 0;
38 oss_cfg.mixer_device = 0;
39 oss_cfg.buffer_size = 3000; 38 oss_cfg.buffer_size = 3000;
40 oss_cfg.prebuffer = 25; 39 oss_cfg.prebuffer = 25;
41 oss_cfg.use_alt_audio_device = FALSE; 40 oss_cfg.use_alt_audio_device = FALSE;
42 oss_cfg.alt_audio_device = NULL; 41 oss_cfg.alt_audio_device = NULL;
43 oss_cfg.use_master = 0;
44 42
45 if ((db = bmp_cfg_db_open())) { 43 if ((db = bmp_cfg_db_open())) {
46 bmp_cfg_db_get_int(db, "OSS", "saved_volume", &vol);
47 bmp_cfg_db_get_int(db, "OSS", "audio_device", &oss_cfg.audio_device); 44 bmp_cfg_db_get_int(db, "OSS", "audio_device", &oss_cfg.audio_device);
48 bmp_cfg_db_get_int(db, "OSS", "mixer_device", &oss_cfg.mixer_device);
49 bmp_cfg_db_get_int(db, "OSS", "buffer_size", &oss_cfg.buffer_size); 45 bmp_cfg_db_get_int(db, "OSS", "buffer_size", &oss_cfg.buffer_size);
50 bmp_cfg_db_get_int(db, "OSS", "prebuffer", &oss_cfg.prebuffer); 46 bmp_cfg_db_get_int(db, "OSS", "prebuffer", &oss_cfg.prebuffer);
51 bmp_cfg_db_get_bool(db, "OSS", "use_master", &oss_cfg.use_master); 47 bmp_cfg_db_get_bool(db, "OSS", "save_volume", &oss_cfg.save_volume);
52 bmp_cfg_db_get_bool(db, "OSS", "use_alt_audio_device", 48 bmp_cfg_db_get_bool(db, "OSS", "use_alt_audio_device",
53 &oss_cfg.use_alt_audio_device); 49 &oss_cfg.use_alt_audio_device);
54 bmp_cfg_db_get_string(db, "OSS", "alt_audio_device", 50 bmp_cfg_db_get_string(db, "OSS", "alt_audio_device",
55 &oss_cfg.alt_audio_device); 51 &oss_cfg.alt_audio_device);
56 bmp_cfg_db_get_bool(db, "OSS", "use_alt_mixer_device", 52 bmp_cfg_db_get_int(db, "OSS", "saved_volume", &vol);
57 &oss_cfg.use_alt_mixer_device);
58 bmp_cfg_db_get_string(db, "OSS", "alt_mixer_device",
59 &oss_cfg.alt_mixer_device);
60 bmp_cfg_db_close(db); 53 bmp_cfg_db_close(db);
61 } 54 }
55 //volume gets saved anyway, but is ignored unless "saved_volume" is true
56 if(!oss_cfg.save_volume)
57 vol=0x6464; //maximum
58
59
62 } 60 }