Attachment #60351 for bug #76127







/* int verbose=5;*/
extern int verbose;
char* get_path(char* x){  return strdup(x);}

#define TRUESPEECH_FORMAT 0x22

// Returns:
//   0: success
//   1: error
int main_convertfile(char* infile, char* outfile, int infilepcm)
{
  WAVEFORMATEX *ts_wf = 0;
  WAVEFORMATEX pcm_wf;


  printf("converting pcm to truespeech\n");

  if (main_convertfile(PCM_INFILE, TS_OUTFILE, 1))
  {
    printf("error converting pcm -> truespeech\n");
    //return 1;


  printf("converting truespeech to pcm\n");
  
  if (main_convertfile(TS_OUTFILE, PCM_OUTFILE, 0))
  {
    printf("error converting truespeech -> pcm\n");
    return 1;




	prevtable.attach( Label(' '+_("Speaker")+':'), 0, 1, 0, 1, (EXPAND), (0), 0, 0)
	tvolbox=SoundBar()  # will hold their sound volume
	self.tvolbox=tvolbox
	prevtable.attach( tvolbox, 1, 2, 0, 1, (EXPAND), (0), 0, 0)
	prevtable.attach( Label('     '+_("Name")+':'), 0, 1, 1, 2, (EXPAND), (0), 0, 0)
	prevtable.attach( Label('     '+_("Alias")+':'), 0, 1, 2, 3, (EXPAND), (0), 0, 0)
	self.nstatusbar = Statusbar ()
	self.nstatusbar.set_size_request(170,-1)
        self.nstatid=self.nstatusbar.get_context_id("screenname")
	prevtable.attach( self.nstatusbar, 1, 2, 1, 2, (EXPAND), (0), 0, 0)
	self.astatusbar = Statusbar ()
	self.astatusbar.set_size_request(170,-1)
        self.astatid=self.astatusbar.get_context_id("screenalias")
	prevtable.attach( self.astatusbar, 1, 2, 2, 3, (EXPAND), (0), 0, 0)

	mainvbox.pack_start(prevtable,0,0,1)





	return sys.argv[0][0:sys.argv[0].rfind(os.sep)+1]

def getPixDir() :
#	return getBaseDir()+os.sep+"pixmaps"+os.sep
	return "/usr/share/gyache/pixmaps/"

locale_dirs=[getBaseDir()+'/locale','/usr/share/locale','/usr/X11R6/share/locale','/usr/locale','/usr/local/share/locale']


	prevtable.attach( Label(' '+_("Speaker")+':'), 0, 1, 0, 1, (EXPAND), (0), 0, 0)
	tvolbox=SoundBar()  # will hold their sound volume
	self.tvolbox=tvolbox
	prevtable.attach( tvolbox, 1, 2, 0, 1, (EXPAND), (0), 0, 0)
	prevtable.attach( Label('     '+_("Name")+':'), 0, 1, 1, 2, (EXPAND), (0), 0, 0)
	prevtable.attach( Label('     '+_("Alias")+':'), 0, 1, 2, 3, (EXPAND), (0), 0, 0)
	self.nstatusbar = Statusbar ()
	self.nstatusbar.set_size_request(170,-1)
        self.nstatid=self.nstatusbar.get_context_id("screenname")
	prevtable.attach( self.nstatusbar, 1, 2, 1, 2, (EXPAND), (0), 0, 0)
	self.astatusbar = Statusbar ()
	self.astatusbar.set_size_request(170,-1)
        self.astatid=self.astatusbar.get_context_id("screenalias")
	prevtable.attach( self.astatusbar, 1, 2, 2, 3, (EXPAND), (0), 0, 0)

	mainvbox.pack_start(prevtable,0,0,1)





#~/usr/bin/env python

from distutils.core import setup, Extension

setup(name="pyvoice",
	version="1.0.6",
	ext_modules=[Extension('_pyesd', ['pytsp/pyesd.c','pytsp/pyesd.i'],
			library_dirs=['/usr/lib'],
			libraries=['esd', 
				   'audiofile', 
				   'm', 
				   'asound'
				   ]
			),
		Extension('_pytsp',['pytsp/pyesd.c',
				   'pytsp/pyesd.i',
				   'pytsp/pytruespeech.c',
				   'pytsp/ldt_keeper.c',
				   'pytsp/pe_image.c',
				   'pytsp/module.c',
				   'pytsp/ext.c',
				   'pytsp/win32.c',
				   'pytsp/driver.c',
				   'pytsp/pe_resource.c',
				   'pytsp/resource.c',
				   'pytsp/registry.c',
				   'pytsp/elfdll.c',
				   'pytsp/afl.c',
				   'pytsp/vfl.c',
				   'pytsp/cpudetect.c',
				   'pytsp/mp_msg.c',
				   'pytsp/pytsp.i',
				   'pytsp/main.c'],
		extra_objects=['pytsp/wrapper.o','pytsp/stubs.o'],
		include_dirs=['pytsp'],
		define_macros=[('__WINE__','None'),
				('dbg_printf','__vprintf'),
				('MPLAYER','None'),
				('TRACE','__vprintf'),
				('_REENTRANT','None')],
		library_dirs=['/usr/lib'],
		libraries=['esd', 
			   'audiofile', 
			   'm', 
			   'asound'
			   ]
			)
		],
	package_dir = {"":"pyvoice"},
	py_modules=["pyvoice","pyvoiceui"]
	)

Return to bug 76127

Lines 22-28 Link Here

(-)1.0.7.orig/pytsp/main.c (-4 / +5 lines)
22		22
23		23
24		24
25	int verbose=5;	25	/* int verbose=5;*/
		26	extern int verbose;
26	char* get_path(char* x){ return strdup(x);}	27	char* get_path(char* x){ return strdup(x);}
27		28
28	#define TRUESPEECH_FORMAT 0x22	29	#define TRUESPEECH_FORMAT 0x22
Lines 54-60 Link Here
54	// Returns:	55	// Returns:
55	// 0: success	56	// 0: success
56	// 1: error	57	// 1: error
57	int convertfile(char* infile, char* outfile, int infilepcm)	58	int main_convertfile(char* infile, char* outfile, int infilepcm)
58	{	59	{
59	WAVEFORMATEX *ts_wf = 0;	60	WAVEFORMATEX *ts_wf = 0;
60	WAVEFORMATEX pcm_wf;	61	WAVEFORMATEX pcm_wf;
Lines 430-436 Link Here
430		431
431	printf("converting pcm to truespeech\n");	432	printf("converting pcm to truespeech\n");
432		433
433	if (convertfile(PCM_INFILE, TS_OUTFILE, 1))	434	if (main_convertfile(PCM_INFILE, TS_OUTFILE, 1))
434	{	435	{
435	printf("error converting pcm -> truespeech\n");	436	printf("error converting pcm -> truespeech\n");
436	//return 1;	437	//return 1;
Lines 438-444 Link Here
438		439
439	printf("converting truespeech to pcm\n");	440	printf("converting truespeech to pcm\n");
440		441
441	if (convertfile(TS_OUTFILE, PCM_OUTFILE, 0))	442	if (main_convertfile(TS_OUTFILE, PCM_OUTFILE, 0))
442	{	443	{
443	printf("error converting truespeech -> pcm\n");	444	printf("error converting truespeech -> pcm\n");
444	return 1;	445	return 1;

Lines 295-311 Link Here

(-)1.0.7.orig/pyvoice/pyvoice (-3 / +3 lines)
295	prevtable.attach( Label(' '+_("Speaker")+':'), 0, 1, 0, 1, (EXPAND), (0), 0, 0)	295	prevtable.attach( Label(' '+_("Speaker")+':'), 0, 1, 0, 1, (EXPAND), (0), 0, 0)
296	tvolbox=SoundBar() # will hold their sound volume	296	tvolbox=SoundBar() # will hold their sound volume
297	self.tvolbox=tvolbox	297	self.tvolbox=tvolbox
298	prevtable.attach( tvolbox, 1, 2, 0, 1, (EXPAND+FILL), (0), 0, 0)	298	prevtable.attach( tvolbox, 1, 2, 0, 1, (EXPAND), (0), 0, 0)
299	prevtable.attach( Label(' '+_("Name")+':'), 0, 1, 1, 2, (EXPAND), (0), 0, 0)	299	prevtable.attach( Label(' '+_("Name")+':'), 0, 1, 1, 2, (EXPAND), (0), 0, 0)
300	prevtable.attach( Label(' '+_("Alias")+':'), 0, 1, 2, 3, (EXPAND), (0), 0, 0)	300	prevtable.attach( Label(' '+_("Alias")+':'), 0, 1, 2, 3, (EXPAND), (0), 0, 0)
301	self.nstatusbar = Statusbar ()	301	self.nstatusbar = Statusbar ()
302	self.nstatusbar.set_size_request(170,-1)	302	self.nstatusbar.set_size_request(170,-1)
303	self.nstatid=self.nstatusbar.get_context_id("screenname")	303	self.nstatid=self.nstatusbar.get_context_id("screenname")
304	prevtable.attach( self.nstatusbar, 1, 2, 1, 2, (EXPAND+FILL), (0), 0, 0)	304	prevtable.attach( self.nstatusbar, 1, 2, 1, 2, (EXPAND), (0), 0, 0)
305	self.astatusbar = Statusbar ()	305	self.astatusbar = Statusbar ()
306	self.astatusbar.set_size_request(170,-1)	306	self.astatusbar.set_size_request(170,-1)
307	self.astatid=self.astatusbar.get_context_id("screenalias")	307	self.astatid=self.astatusbar.get_context_id("screenalias")
308	prevtable.attach( self.astatusbar, 1, 2, 2, 3, (EXPAND+FILL), (0), 0, 0)	308	prevtable.attach( self.astatusbar, 1, 2, 2, 3, (EXPAND), (0), 0, 0)
309		309
310	mainvbox.pack_start(prevtable,0,0,1)	310	mainvbox.pack_start(prevtable,0,0,1)
311		311

Lines 87-93 Link Here

(-)1.0.7.orig/pyvoice/pyvoiceui.py (-4 / +5 lines)
87	return sys.argv[0][0:sys.argv[0].rfind(os.sep)+1]	87	return sys.argv[0][0:sys.argv[0].rfind(os.sep)+1]
88		88
89	def getPixDir() :	89	def getPixDir() :
90	return getBaseDir()+os.sep+"pixmaps"+os.sep	90	# return getBaseDir()+os.sep+"pixmaps"+os.sep
		91	return "/usr/share/gyache/pixmaps/"
91		92
92	locale_dirs=[getBaseDir()+'/locale','/usr/share/locale','/usr/X11R6/share/locale','/usr/locale','/usr/local/share/locale']	93	locale_dirs=[getBaseDir()+'/locale','/usr/share/locale','/usr/X11R6/share/locale','/usr/locale','/usr/local/share/locale']
93		94
Lines 295-311 Link Here
295	prevtable.attach( Label(' '+_("Speaker")+':'), 0, 1, 0, 1, (EXPAND), (0), 0, 0)	296	prevtable.attach( Label(' '+_("Speaker")+':'), 0, 1, 0, 1, (EXPAND), (0), 0, 0)
296	tvolbox=SoundBar() # will hold their sound volume	297	tvolbox=SoundBar() # will hold their sound volume
297	self.tvolbox=tvolbox	298	self.tvolbox=tvolbox
298	prevtable.attach( tvolbox, 1, 2, 0, 1, (EXPAND+FILL), (0), 0, 0)	299	prevtable.attach( tvolbox, 1, 2, 0, 1, (EXPAND), (0), 0, 0)
299	prevtable.attach( Label(' '+_("Name")+':'), 0, 1, 1, 2, (EXPAND), (0), 0, 0)	300	prevtable.attach( Label(' '+_("Name")+':'), 0, 1, 1, 2, (EXPAND), (0), 0, 0)
300	prevtable.attach( Label(' '+_("Alias")+':'), 0, 1, 2, 3, (EXPAND), (0), 0, 0)	301	prevtable.attach( Label(' '+_("Alias")+':'), 0, 1, 2, 3, (EXPAND), (0), 0, 0)
301	self.nstatusbar = Statusbar ()	302	self.nstatusbar = Statusbar ()
302	self.nstatusbar.set_size_request(170,-1)	303	self.nstatusbar.set_size_request(170,-1)
303	self.nstatid=self.nstatusbar.get_context_id("screenname")	304	self.nstatid=self.nstatusbar.get_context_id("screenname")
304	prevtable.attach( self.nstatusbar, 1, 2, 1, 2, (EXPAND+FILL), (0), 0, 0)	305	prevtable.attach( self.nstatusbar, 1, 2, 1, 2, (EXPAND), (0), 0, 0)
305	self.astatusbar = Statusbar ()	306	self.astatusbar = Statusbar ()
306	self.astatusbar.set_size_request(170,-1)	307	self.astatusbar.set_size_request(170,-1)
307	self.astatid=self.astatusbar.get_context_id("screenalias")	308	self.astatid=self.astatusbar.get_context_id("screenalias")
308	prevtable.attach( self.astatusbar, 1, 2, 2, 3, (EXPAND+FILL), (0), 0, 0)	309	prevtable.attach( self.astatusbar, 1, 2, 2, 3, (EXPAND), (0), 0, 0)
309		310
310	mainvbox.pack_start(prevtable,0,0,1)	311	mainvbox.pack_start(prevtable,0,0,1)
311		312

Line 0 Link Here

(-)1.0.7.orig/setup.py (+51 lines)
	1	#~/usr/bin/env python
	2
	3	from distutils.core import setup, Extension
	4
	5	setup(name="pyvoice",
	6	version="1.0.6",
	7	ext_modules=[Extension('_pyesd', ['pytsp/pyesd.c','pytsp/pyesd.i'],
	8	library_dirs=['/usr/lib'],
	9	libraries=['esd',
	10	'audiofile',
	11	'm',
	12	'asound'
	13	]
	14	),
	15	Extension('_pytsp',['pytsp/pyesd.c',
	16	'pytsp/pyesd.i',
	17	'pytsp/pytruespeech.c',
	18	'pytsp/ldt_keeper.c',
	19	'pytsp/pe_image.c',
	20	'pytsp/module.c',
	21	'pytsp/ext.c',
	22	'pytsp/win32.c',
	23	'pytsp/driver.c',
	24	'pytsp/pe_resource.c',
	25	'pytsp/resource.c',
	26	'pytsp/registry.c',
	27	'pytsp/elfdll.c',
	28	'pytsp/afl.c',
	29	'pytsp/vfl.c',
	30	'pytsp/cpudetect.c',
	31	'pytsp/mp_msg.c',
	32	'pytsp/pytsp.i',
	33	'pytsp/main.c'],
	34	extra_objects=['pytsp/wrapper.o','pytsp/stubs.o'],
	35	include_dirs=['pytsp'],
	36	define_macros=[('__WINE__','None'),
	37	('dbg_printf','__vprintf'),
	38	('MPLAYER','None'),
	39	('TRACE','__vprintf'),
	40	('_REENTRANT','None')],
	41	library_dirs=['/usr/lib'],
	42	libraries=['esd',
	43	'audiofile',
	44	'm',
	45	'asound'
	46	]
	47	)
	48	],
	49	package_dir = {"":"pyvoice"},
	50	py_modules=["pyvoice","pyvoiceui"]
	51	)