Navigation

Changeset 60:8017039f55b1

Timestamp:

08/25/06 16:29:35 (2 years ago)

Author:

halina@ada

Message:

portaudio removed for armlinux

Files:

r54	r60
25	25	BoolOption('debug', "Enable debug build", True),
26	26	BoolOption('qos_debug', "Enable QoS debugging functionality", False),
27		BoolOption('enable_alsa', "Disable ALSA driver", ~~Fals~~e),
	27	BoolOption('enable_alsa', "Disable ALSA driver", True),
28	28	('target_os', "Target platform", sys.platform),
29	29	('VERONA_VERSION', "Software version", "0.0.2")

r56	r60
42	42
43	43	if BJ.armlinuxTarget:
44		libs += ["z", "veronacurl", "portaudio", "asound"]
	44	libs += ["z", "veronacurl", "asound"]
	45	# libs += ["z", "veronacurl", "portaudio", "asound"]
45	46
46	47

r55	r60
253	253	defines['PHAPI_VIDEO_LOCAL_HACK'] = 1
254	254
255		if not BJ.osxTarget:
	255	if not BJ.osxTarget and not BJ.armlinuxTarget:
256	256	libs += ['portaudio']
257	257	defines['ENABLE_PORTAUDIO'] = 1

r4	r60
42	42
43	43	// MEDIA_ENGINE
44		#if 0
	44	#if 1
45	45	#define DBG1_MEDIA_ENGINE(x1) printf(x1)
46	46	#define DBG2_MEDIA_ENGINE(x1, x2) printf(x1, x2)
…	…
73	73
74	74	// DYNA_AUDIO_DRV
75		#if 0
	75	#if 1
76	76	#define DBG5_DYNA_AUDIO_DRV(x1, x2, x3, x4, x5) printf(x1, x2, x3, x4, x5)
77	77	#define DBG8_DYNA_AUDIO_DRV(x1, x2, x3, x4, x5, x6, x7, x8) printf(x1, x2, x3, x4, x5, x6, x7, x8)

r51	r60
1980	1980	forcedDeviceId = getenv("PH_FORCE_AUDIO_DEVICE");
1981	1981
	1982	printf("Forced Device name is %s\n", forcedDeviceId);
	1983
1982	1984	if (forcedDeviceId)
1983	1985	deviceId = forcedDeviceId;
…	…
1995	1997	}
1996	1998
	1999	printf("Device name is %s\n", deviceId);
1997	2000
1998	2001	if (ph_activate_audio_driver(deviceId))

r4	r60
96	96
97	97	d = ph_find_audio_driver(name);
	98
	99	printf("Driver %s %s found\n", name, d?"":"not");
98	100
99	101	if (!d)

r4	r60
84	84	{
85	85	ph_register_audio_driver(&ph_alsa_driver);
	86	printf("PHAPI:ALSA driver init\n");
86	87	}
87	88