Mercurial > hg > xmms-sid

comparison src/xs_config.c @ 161:02bbce56d6b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Renamed some struct variables.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 06 Jun 2004 03:15:04 +0000
parents a7abcda7a86c
children 676ec1a1ab93
comparison
equal deleted inserted replaced
160:450fea61cad5 161:02bbce56d6b0
253 } 253 }
254 254
255 /* Read the new settings from XMMS configuration file */ 255 /* Read the new settings from XMMS configuration file */
256 for (i = 0; i < xs_cfgtable_max; i++) 256 for (i = 0; i < xs_cfgtable_max; i++)
257 { 257 {
258 switch (xs_cfgtable[i].valType) { 258 switch (xs_cfgtable[i].itemType) {
259 case CTYPE_INT: 259 case CTYPE_INT:
260 xmms_cfg_read_int(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].valName, (gint *) xs_cfgtable[i].valData); 260 xmms_cfg_read_int(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].itemName, (gint *) xs_cfgtable[i].itemData);
261 break; 261 break;
262 262
263 case CTYPE_BOOL: 263 case CTYPE_BOOL:
264 xmms_cfg_read_boolean(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].valName, (gboolean *) xs_cfgtable[i].valData); 264 xmms_cfg_read_boolean(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].itemName, (gboolean *) xs_cfgtable[i].itemData);
265 break; 265 break;
266 266
267 case CTYPE_FLOAT: 267 case CTYPE_FLOAT:
268 xmms_cfg_read_float(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].valName, (gfloat *) xs_cfgtable[i].valData); 268 xmms_cfg_read_float(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].itemName, (gfloat *) xs_cfgtable[i].itemData);
269 break; 269 break;
270 270
271 case CTYPE_STR: 271 case CTYPE_STR:
272 if (xmms_cfg_read_string(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].valName, (gchar **) &tmpStr)) 272 if (xmms_cfg_read_string(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].itemName, (gchar **) &tmpStr))
273 { 273 {
274 /* Read was successfull */ 274 /* Read was successfull */
275 xs_strcalloc((gchar **) xs_cfgtable[i].valData, tmpStr); 275 xs_strcalloc((gchar **) xs_cfgtable[i].itemData, tmpStr);
276 g_free(tmpStr); 276 g_free(tmpStr);
277 } 277 }
278 break; 278 break;
279 279
280 default: 280 default:
318 318
319 319
320 /* Write the new settings to XMMS configuration file */ 320 /* Write the new settings to XMMS configuration file */
321 for (i = 0; i < xs_cfgtable_max; i++) 321 for (i = 0; i < xs_cfgtable_max; i++)
322 { 322 {
323 switch (xs_cfgtable[i].valType) { 323 switch (xs_cfgtable[i].itemType) {
324 case CTYPE_INT: 324 case CTYPE_INT:
325 xmms_cfg_write_int(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].valName, *(gint *) xs_cfgtable[i].valData); 325 xmms_cfg_write_int(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].itemName, *(gint *) xs_cfgtable[i].itemData);
326 break; 326 break;
327 327
328 case CTYPE_BOOL: 328 case CTYPE_BOOL:
329 xmms_cfg_write_boolean(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].valName, *(gboolean *) xs_cfgtable[i].valData); 329 xmms_cfg_write_boolean(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].itemName, *(gboolean *) xs_cfgtable[i].itemData);
330 break; 330 break;
331 331
332 case CTYPE_FLOAT: 332 case CTYPE_FLOAT:
333 xmms_cfg_write_float(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].valName, *(gfloat *) xs_cfgtable[i].valData); 333 xmms_cfg_write_float(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].itemName, *(gfloat *) xs_cfgtable[i].itemData);
334 break; 334 break;
335 335
336 case CTYPE_STR: 336 case CTYPE_STR:
337 xmms_cfg_write_string(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].valName, *(gchar **) xs_cfgtable[i].valData); 337 xmms_cfg_write_string(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].itemName, *(gchar **) xs_cfgtable[i].itemData);
338 break; 338 break;
339 339
340 default: 340 default:
341 XSERR("Internal: Unsupported setting type found while writing configuration file. Please report to author!\n"); 341 XSERR("Internal: Unsupported setting type found while writing configuration file. Please report to author!\n");
342 break; 342 break;
384 case WTYPE_BGROUP: 384 case WTYPE_BGROUP:
385 /* Check if toggle-button is active */ 385 /* Check if toggle-button is active */
386 if (GTK_TOGGLE_BUTTON(LUW(xs_widtable[i].widName))->active) 386 if (GTK_TOGGLE_BUTTON(LUW(xs_widtable[i].widName))->active)
387 { 387 {
388 /* Yes, set the constant value */ 388 /* Yes, set the constant value */
389 *((gint *) xs_widtable[i].valData) = xs_widtable[i].valSet; 389 *((gint *) xs_widtable[i].itemData) = xs_widtable[i].itemSet;
390 } 390 }
391 break; 391 break;
392 392
393 case WTYPE_SPIN: 393 case WTYPE_SPIN:
394 case WTYPE_SCALE: 394 case WTYPE_SCALE:
407 default: 407 default:
408 tmpValue = -1; 408 tmpValue = -1;
409 } 409 }
410 410
411 /* Set the value */ 411 /* Set the value */
412 switch (xs_widtable[i].valType) { 412 switch (xs_widtable[i].itemType) {
413 case CTYPE_INT: 413 case CTYPE_INT:
414 *((gint *) xs_widtable[i].valData) = (gint) tmpValue; 414 *((gint *) xs_widtable[i].itemData) = (gint) tmpValue;
415 break; 415 break;
416 416
417 case CTYPE_FLOAT: 417 case CTYPE_FLOAT:
418 *((gfloat *) xs_widtable[i].valData) = tmpValue; 418 *((gfloat *) xs_widtable[i].itemData) = tmpValue;
419 break; 419 break;
420 } 420 }
421 break; 421 break;
422 422
423 case WTYPE_BUTTON: 423 case WTYPE_BUTTON:
424 /* Check if toggle-button is active */ 424 /* Check if toggle-button is active */
425 *((gboolean *) xs_widtable[i].valData) = 425 *((gboolean *) xs_widtable[i].itemData) =
426 (GTK_TOGGLE_BUTTON(LUW(xs_widtable[i].widName))->active); 426 (GTK_TOGGLE_BUTTON(LUW(xs_widtable[i].widName))->active);
427 break; 427 break;
428 428
429 case WTYPE_TEXT: 429 case WTYPE_TEXT:
430 /* Get text from text-widget */ 430 /* Get text from text-widget */
431 xs_strcalloc((gchar **) xs_widtable[i].valData, 431 xs_strcalloc((gchar **) xs_widtable[i].itemData,
432 gtk_entry_get_text(GTK_ENTRY(LUW(xs_widtable[i].widName))) 432 gtk_entry_get_text(GTK_ENTRY(LUW(xs_widtable[i].widName)))
433 ); 433 );
434 break; 434 break;
435 } 435 }
436 } 436 }
682 switch (xs_widtable[i].widType) { 682 switch (xs_widtable[i].widType) {
683 case WTYPE_BGROUP: 683 case WTYPE_BGROUP:
684 /* Check if current value matches the given one */ 684 /* Check if current value matches the given one */
685 gtk_toggle_button_set_active( 685 gtk_toggle_button_set_active(
686 GTK_TOGGLE_BUTTON(LUW(xs_widtable[i].widName)), 686 GTK_TOGGLE_BUTTON(LUW(xs_widtable[i].widName)),
687 (*((gint *) xs_widtable[i].valData) == xs_widtable[i].valSet) 687 (*((gint *) xs_widtable[i].itemData) == xs_widtable[i].itemSet)
688 ); 688 );
689 break; 689 break;
690 690
691 691
692 case WTYPE_SPIN: 692 case WTYPE_SPIN:
693 case WTYPE_SCALE: 693 case WTYPE_SCALE:
694 /* Get the value */ 694 /* Get the value */
695 switch (xs_widtable[i].valType) { 695 switch (xs_widtable[i].itemType) {
696 case CTYPE_INT: 696 case CTYPE_INT:
697 tmpValue = (gfloat) *((gint *) xs_widtable[i].valData); 697 tmpValue = (gfloat) *((gint *) xs_widtable[i].itemData);
698 break; 698 break;
699 699
700 case CTYPE_FLOAT: 700 case CTYPE_FLOAT:
701 tmpValue = *((gfloat *) xs_widtable[i].valData); 701 tmpValue = *((gfloat *) xs_widtable[i].itemData);
702 break; 702 break;
703 703
704 default: 704 default:
705 tmpValue = -1; 705 tmpValue = -1;
706 } 706 }
723 723
724 case WTYPE_BUTTON: 724 case WTYPE_BUTTON:
725 /* Set toggle-button */ 725 /* Set toggle-button */
726 gtk_toggle_button_set_active( 726 gtk_toggle_button_set_active(
727 GTK_TOGGLE_BUTTON(LUW(xs_widtable[i].widName)), 727 GTK_TOGGLE_BUTTON(LUW(xs_widtable[i].widName)),
728 *((gboolean *) xs_widtable[i].valData) 728 *((gboolean *) xs_widtable[i].itemData)
729 ); 729 );
730 break; 730 break;
731 731
732 case WTYPE_TEXT: 732 case WTYPE_TEXT:
733 /* Set text to text-widget */ 733 /* Set text to text-widget */
734 if (*(gchar **) xs_widtable[i].valData != NULL) 734 if (*(gchar **) xs_widtable[i].itemData != NULL)
735 { 735 {
736 gtk_entry_set_text( 736 gtk_entry_set_text(
737 GTK_ENTRY(LUW(xs_widtable[i].widName)), 737 GTK_ENTRY(LUW(xs_widtable[i].widName)),
738 *(gchar **) xs_widtable[i].valData); 738 *(gchar **) xs_widtable[i].itemData);
739 } 739 }
740 break; 740 break;
741 } 741 }
742 } 742 }
743 743