comparison src/cdaudio-ng/cdaudio-ng.c @ 1339:83cbc6968a0b

Set DAE the default and non-optional play method; Configuring the plugin no longer stops the playback;
author Calin Crisan ccrisan@gmail.com
date Mon, 23 Jul 2007 21:43:17 +0300
parents b93270e2b7e4
children 7bb2692b3be9
comparison
equal deleted inserted replaced
1338:0d4450d66bd1 1339:83cbc6968a0b
119 libcddb_init(); 119 libcddb_init();
120 120
121 ConfigDb *db = bmp_cfg_db_open(); 121 ConfigDb *db = bmp_cfg_db_open();
122 gchar *string = NULL; 122 gchar *string = NULL;
123 123
124 /*
124 if (!bmp_cfg_db_get_bool(db, "CDDA", "use_dae", &use_dae)) 125 if (!bmp_cfg_db_get_bool(db, "CDDA", "use_dae", &use_dae))
125 use_dae = TRUE; 126 use_dae = TRUE;
127 */
126 if (!bmp_cfg_db_get_int(db, "CDDA", "limitspeed", &limitspeed)) 128 if (!bmp_cfg_db_get_int(db, "CDDA", "limitspeed", &limitspeed))
127 limitspeed = 1; 129 limitspeed = 1;
128 if (!bmp_cfg_db_get_bool(db, "CDDA", "use_cdtext", &use_cdtext)) 130 if (!bmp_cfg_db_get_bool(db, "CDDA", "use_cdtext", &use_cdtext))
129 use_cdtext = TRUE; 131 use_cdtext = TRUE;
130 if (!bmp_cfg_db_get_bool(db, "CDDA", "use_cddb", &use_cddb)) 132 if (!bmp_cfg_db_get_bool(db, "CDDA", "use_cddb", &use_cddb))
143 debug = FALSE; 145 debug = FALSE;
144 146
145 bmp_cfg_db_close(db); 147 bmp_cfg_db_close(db);
146 148
147 if (debug) 149 if (debug)
148 printf("cdaudio-ng: configuration: use_dae = %d, limitspeed = %d, use_cdtext = %d, use_cddb = %d, cddbserver = \"%s\", cddbport = %d, device = \"%s\", debug = %d\n", use_dae, limitspeed, use_cdtext, use_cddb, cddb_server, cddb_port, device, debug); 150 printf("cdaudio-ng: configuration: "/*use_dae = %d, */"limitspeed = %d, use_cdtext = %d, use_cddb = %d, cddbserver = \"%s\", cddbport = %d, device = \"%s\", debug = %d\n", /*use_dae, */limitspeed, use_cdtext, use_cddb, cddb_server, cddb_port, device, debug);
149 151
150 configure_set_variables(&use_dae, &limitspeed, &use_cdtext, &use_cddb, device, &debug, cddb_server, &cddb_port); 152 configure_set_variables(/*&use_dae, */&limitspeed, &use_cdtext, &use_cddb, device, &debug, cddb_server, &cddb_port);
151 configure_create_gui(); 153 configure_create_gui();
152 } 154 }
153 155
154 void cdaudio_about() 156 void cdaudio_about()
155 { 157 {
160 void cdaudio_configure() 162 void cdaudio_configure()
161 { 163 {
162 if (debug) 164 if (debug)
163 printf("cdaudio-ng: cdaudio_configure()\n"); 165 printf("cdaudio-ng: cdaudio_configure()\n");
164 166
165 /* if playback is started, we stop it */ 167 /*
166 if (playing_track != -1) 168 if (playing_track != -1)
167 playback_stop(); 169 playback_stop();
170 */
168 171
169 configure_show_gui(); 172 configure_show_gui();
170 } 173 }
171 174
172 gint cdaudio_is_our_file(gchar *filename) 175 gint cdaudio_is_our_file(gchar *filename)
254 } 257 }
255 cdio_free_device_list(ppcd_drives); 258 cdio_free_device_list(ppcd_drives);
256 } 259 }
257 260
258 /* limit read speed */ 261 /* limit read speed */
259 if (limitspeed > 0 && !use_dae) { 262 if (limitspeed > 0 && use_dae) {
260 if (debug) 263 if (debug)
261 printf("cdaudio-ng: setting drive speed limit to %dx\n", limitspeed); 264 printf("cdaudio-ng: setting drive speed limit to %dx\n", limitspeed);
262 if (cdio_set_speed(pcdio, limitspeed) != DRIVER_OP_SUCCESS) 265 if (cdio_set_speed(pcdio, limitspeed) != DRIVER_OP_SUCCESS)
263 fprintf(stderr, "cdaudio-ng: failed to set drive speed to %dx\n", limitspeed); 266 fprintf(stderr, "cdaudio-ng: failed to set drive speed to %dx\n", limitspeed);
264 } 267 }
687 playing_track = -1; 690 playing_track = -1;
688 691
689 // todo: destroy the gui 692 // todo: destroy the gui
690 693
691 ConfigDb *db = bmp_cfg_db_open(); 694 ConfigDb *db = bmp_cfg_db_open();
692 bmp_cfg_db_set_bool(db, "CDDA", "use_dae", use_dae); 695 /*bmp_cfg_db_set_bool(db, "CDDA", "use_dae", use_dae);*/
693 bmp_cfg_db_set_int(db, "CDDA", "limitspeed", limitspeed); 696 bmp_cfg_db_set_int(db, "CDDA", "limitspeed", limitspeed);
694 bmp_cfg_db_set_bool(db, "CDDA", "use_cdtext", use_cdtext); 697 bmp_cfg_db_set_bool(db, "CDDA", "use_cdtext", use_cdtext);
695 bmp_cfg_db_set_bool(db, "CDDA", "use_cddb", use_cddb); 698 bmp_cfg_db_set_bool(db, "CDDA", "use_cddb", use_cddb);
696 bmp_cfg_db_set_string(db, "CDDA", "cddbserver", cddb_server); 699 bmp_cfg_db_set_string(db, "CDDA", "cddbserver", cddb_server);
697 bmp_cfg_db_set_int(db, "CDDA", "cddbport", cddb_port); 700 bmp_cfg_db_set_int(db, "CDDA", "cddbport", cddb_port);