[Mplayerplug-in-cvs] mplayerplug-in/Source plugin-ui.cpp, 1.253, 1.254

[Kevin D. <kde...@us...>]

Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12062/Source

Modified Files:
	plugin-ui.cpp 
Log Message:
Fix display issue when pulse audio is selected, and add pulse to options


Index: plugin-ui.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-ui.cpp,v
retrieving revision 1.253
retrieving revision 1.254
diff -C2 -d -r1.253 -r1.254
*** plugin-ui.cpp	30 Dec 2007 22:27:45 -0000	1.253
--- plugin-ui.cpp	12 Jun 2008 14:01:02 -0000	1.254
***************
*** 2776,2779 ****
--- 2776,2780 ----
  				  "jack");
  	gtk_combo_box_append_text(GTK_COMBO_BOX(instance->conf_ao), "oss");
+ 	gtk_combo_box_append_text(GTK_COMBO_BOX(instance->conf_ao), "pulse");
  	if (instance->ao != NULL) {
  	    if (strcmp(instance->ao, "alsa") == 0)
***************
*** 2792,2795 ****
--- 2793,2799 ----
  		gtk_combo_box_set_active(GTK_COMBO_BOX
  					 (instance->conf_ao), 4);
+ 	    if (strcmp(instance->ao, "pulse") == 0)
+ 		gtk_combo_box_set_active(GTK_COMBO_BOX
+ 					 (instance->conf_ao), 5);
  	    if (gtk_combo_box_get_active(GTK_COMBO_BOX(instance->conf_ao))
  		== -1) {
***************
*** 2798,2802 ****
  					  instance->ao);
  		gtk_combo_box_set_active(GTK_COMBO_BOX
! 					 (instance->conf_ao), 4);
  	    }
  	}
--- 2802,2806 ----
  					  instance->ao);
  		gtk_combo_box_set_active(GTK_COMBO_BOX
! 					 (instance->conf_ao), 6);
  	    }
  	}