changeset 1704:365a2b043447 trunk

[svn] - remove debugging printf()'s
author nenolod
date Fri, 15 Sep 2006 18:24:27 -0700
parents 409444cb0605
children ffa7b9168190
files ChangeLog Plugins/Output/CoreAudio/configure.c Plugins/Output/CoreAudio/convert.c
diffstat 3 files changed, 10 insertions(+), 45 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Sep 15 16:48:51 2006 -0700
+++ b/ChangeLog	Fri Sep 15 18:24:27 2006 -0700
@@ -1,3 +1,12 @@
+2006-09-15 23:48:51 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2343]
+  - only build cdaudio plugin if we support DAE
+  
+
+  Changes:        Modified:
+  +2 -1           trunk/configure.ac  
+
+
 2006-09-15 23:36:30 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2341]
   - if a pkg-config module is unavailable, report this
--- a/Plugins/Output/CoreAudio/configure.c	Fri Sep 15 16:48:51 2006 -0700
+++ b/Plugins/Output/CoreAudio/configure.c	Fri Sep 15 18:24:27 2006 -0700
@@ -120,14 +120,10 @@
 	}
 	else
 	{
-		printf("there are %d devices\n",size/sizeof(AudioDeviceID));
-		
 		devicelist = (AudioDeviceID*) malloc(size);
 		
 		if (AudioHardwareGetProperty(kAudioHardwarePropertyDevices,&size,devicelist))
-		{
-			printf("failed to get device list");
-		}
+			return;
 		
 		for (i = 0; i < size/sizeof(AudioDeviceID); i++)
 		{
@@ -196,19 +192,6 @@
 	audio_device = osx_cfg.audio_device;
 	gtk_option_menu_set_history(GTK_OPTION_MENU(adevice), osx_cfg.audio_device);
 
-	/*
-	  audio_alt_box = gtk_hbox_new(FALSE, 0);
-		gtk_box_pack_start_defaults(GTK_BOX(adevice_box), audio_alt_box);
-		adevice_use_alt_check = gtk_check_button_new_with_label("Use alternate device:");
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(adevice_use_alt_check), osx_cfg.use_alt_audio_device);
-		gtk_signal_connect(GTK_OBJECT(adevice_use_alt_check), "toggled", audio_device_toggled, adevice);
-   
-		gtk_box_pack_start(GTK_BOX(audio_alt_box), adevice_use_alt_check, FALSE, FALSE, 0);
-		audio_alt_device_entry = gtk_entry_new();
-
-	gtk_box_pack_start_defaults(GTK_BOX(audio_alt_box), audio_alt_device_entry);
-	*/
-
 	gtk_box_pack_start(GTK_BOX(dev_vbox), mdevice_frame, FALSE, FALSE, 0);
 	
 	mdevice_box = gtk_vbox_new(FALSE, 0);
--- a/Plugins/Output/CoreAudio/convert.c	Fri Sep 15 16:48:51 2006 -0700
+++ b/Plugins/Output/CoreAudio/convert.c	Fri Sep 15 18:24:27 2006 -0700
@@ -184,25 +184,18 @@
 	if (output == input)
 		return NULL;
 
-	printf("1\n");
-
 	if ((output == FMT_U16_BE && input == FMT_U16_LE) ||
 	    (output == FMT_U16_LE && input == FMT_U16_BE) ||
 	    (output == FMT_S16_BE && input == FMT_S16_LE) ||
 	    (output == FMT_S16_LE && input == FMT_S16_BE))
 		return convert_swap_endian;
 
-	printf("2\n");
-
 	if ((output == FMT_U16_BE && input == FMT_S16_BE) ||
 	    (output == FMT_U16_LE && input == FMT_S16_LE) ||
 	    (output == FMT_S16_BE && input == FMT_U16_BE) ||
 	    (output == FMT_S16_LE && input == FMT_U16_LE))
 		return convert_swap_sign16;
 
-	printf("3\n");
-
-
 	if ((IS_BIG_ENDIAN &&
 	     ((output == FMT_U16_BE && input == FMT_S16_LE) ||
 	      (output == FMT_S16_BE && input == FMT_U16_LE))) ||
@@ -211,8 +204,6 @@
 	      (output == FMT_S16_LE && input == FMT_U16_BE))))
 		return convert_swap_sign_and_endian_to_native;
 
-	printf("4\n");
-		
 	if ((!IS_BIG_ENDIAN &&
 	     ((output == FMT_U16_BE && input == FMT_S16_LE) ||
 	      (output == FMT_S16_BE && input == FMT_U16_LE))) ||
@@ -221,8 +212,6 @@
 	      (output == FMT_S16_LE && input == FMT_U16_BE))))
 		return convert_swap_sign_and_endian_to_alien;
 
-	printf("5\n");
-
 	if ((IS_BIG_ENDIAN &&
 	     ((output == FMT_U8 && input == FMT_U16_BE) ||
 	      (output == FMT_S8 && input == FMT_S16_BE))) ||
@@ -231,8 +220,6 @@
 	      (output == FMT_S8 && input == FMT_S16_LE))))
 		return convert_to_8_native_endian;
 
-	printf("6\n");
-
 	if ((IS_BIG_ENDIAN &&
 	     ((output == FMT_U8 && input == FMT_S16_BE) ||
 	      (output == FMT_S8 && input == FMT_U16_BE))) ||
@@ -241,8 +228,6 @@
 	      (output == FMT_S8 && input == FMT_U16_LE))))
 		return convert_to_8_native_endian_swap_sign;
 
-	printf("7\n");
-
 	if ((!IS_BIG_ENDIAN &&
 	     ((output == FMT_U8 && input == FMT_U16_BE) ||
 	      (output == FMT_S8 && input == FMT_S16_BE))) ||
@@ -251,8 +236,6 @@
 	      (output == FMT_S8 && input == FMT_S16_LE))))
 		return convert_to_8_alien_endian;
 
-	printf("8\n");
-
 	if ((!IS_BIG_ENDIAN &&
 	     ((output == FMT_U8 && input == FMT_S16_BE) ||
 	      (output == FMT_S8 && input == FMT_U16_BE))) ||
@@ -261,14 +244,10 @@
 	      (output == FMT_S8 && input == FMT_U16_LE))))
 		return convert_to_8_alien_endian_swap_sign;
 
-	printf("9\n");
-
 	if ((output == FMT_U8 && input == FMT_S8) ||
 	    (output == FMT_S8 && input == FMT_U8))
 		return convert_swap_sign8;
 
-	printf("10\n");
-
 	if ((IS_BIG_ENDIAN &&
 	     ((output == FMT_U16_BE && input == FMT_U8) ||
 	      (output == FMT_S16_BE && input == FMT_S8))) ||
@@ -277,8 +256,6 @@
 	      (output == FMT_S16_LE && input == FMT_S8))))
 		return convert_to_16_native_endian;
 
-	printf("11\n");
-
 	if ((IS_BIG_ENDIAN &&
 	     ((output == FMT_U16_BE && input == FMT_S8) ||
 	      (output == FMT_S16_BE && input == FMT_U8))) ||
@@ -287,8 +264,6 @@
 	      (output == FMT_S16_LE && input == FMT_U8))))
 		return convert_to_16_native_endian_swap_sign;
 
-	printf("12\n");
-
 	if ((!IS_BIG_ENDIAN &&
 	     ((output == FMT_U16_BE && input == FMT_U8) ||
 	      (output == FMT_S16_BE && input == FMT_S8))) ||
@@ -297,8 +272,6 @@
 	      (output == FMT_S16_LE && input == FMT_S8))))
 		return convert_to_16_alien_endian;
 
-	printf("14\n");
-
 	if ((!IS_BIG_ENDIAN &&
 	     ((output == FMT_U16_BE && input == FMT_S8) ||
 	      (output == FMT_S16_BE && input == FMT_U8))) ||