Attachment #92748 for bug #141426

Lines 87-93 Link Here

(-)rezound-0.12.2beta.orig/src/frontend_fox/FileActionDialogs.h (-2 / +2 lines)
87	long onDetectDeviceButton(FXObject object,FXSelector sel,void ptr);	87	long onDetectDeviceButton(FXObject object,FXSelector sel,void ptr);
88		88
89	protected:	89	protected:
90	CBurnToCDDialog::CBurnToCDDialog() {}	90	CBurnToCDDialog() {}
91		91
92	const string getExplanation() const;	92	const string getExplanation() const;
93	};	93	};
Lines 111-117 Link Here
111	long onRemoveButton(FXObject object,FXSelector sel,void ptr);	111	long onRemoveButton(FXObject object,FXSelector sel,void ptr);
112		112
113	protected:	113	protected:
114	CRunMacroDialog::CRunMacroDialog() {}	114	CRunMacroDialog() {}
115		115
116	};	116	};
117		117




{
	FXDECLARE(CLevelMeter);
public:
	CLevelMeter(FXComposite *parent) :
		FXHorizontalFrame(parent,LAYOUT_FILL_X|LAYOUT_FIX_HEIGHT|LAYOUT_TOP | FRAME_NONE,0,0,0,0, 0,0,0,0, 0,0),
		statusFont(getApp()->getNormalFont()),
		canvas(new FXCanvas(this,this,ID_CANVAS,FRAME_NONE | LAYOUT_FILL_X|LAYOUT_FILL_Y)),


	}

	~CLevelMeter()
	{
		delete statusFont;
	}

		setHeight(max(statusFont->getFontHeight(),MIN_METER_HEIGHT)); // make meter only as tall as necessary (also with a defined minimum)
	}

	long onCanvasPaint(FXObject *sender,FXSelector sel,void *ptr)
	{
		FXDCWindow dc(canvas);


{
	FXDECLARE(CBalanceMeter);
public:
	CBalanceMeter(FXComposite *parent) :
		FXHorizontalFrame(parent,LAYOUT_FILL_X|LAYOUT_FIX_HEIGHT | FRAME_NONE, 0,0,0,0, 0,0,0,0, 0,0),
		statusFont(getApp()->getNormalFont()),
		leftLabel(new FXLabel(this,"-1.0")),


	}

	~CBalanceMeter()
	{
		delete statusFont;
	}

		setHeight(max(statusFont->getFontHeight(),MIN_METER_HEIGHT)); // make meter only as tall as necessary (also with a defined minimum)
	}

	long onCanvasPaint(FXObject *sender,FXSelector sel,void *ptr)
	{
		FXDCWindow dc(canvas);


{
	FXDECLARE(CStereoPhaseMeter);
public:
	CStereoPhaseMeter(FXComposite *parent,sample_t *_samplingBuffer,size_t _samplingNFrames,unsigned _samplingNChannels,unsigned _samplingLeftChannel,unsigned _samplingRightChannel) :
		FXHorizontalFrame(parent,LAYOUT_RIGHT|LAYOUT_FIX_WIDTH|LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0, 0,0),
		canvasFrame(new FXVerticalFrame(this,LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK,0,0,0,0, 2,2,2,2, 0,1)),
			canvas(new FXBackBufferedCanvas(canvasFrame,this,ID_CANVAS,LAYOUT_FILL_X|LAYOUT_FILL_Y)),

		statusFont=new FXFont(getApp(),d);
	}

	~CStereoPhaseMeter()
	{
		delete statusFont;
	}

	long onZoomDial(FXObject *sender,FXSelector sel,void *ptr)
	{
		zoom=((float)zoomDial->getValue())/100.0f;
		canvas->update(); // not really necessary since we're doing it several times a second anyway
		return 1;
	}

	long onResize(FXObject *sender,FXSelector sel,void *ptr)
	{
		// make square
		resize(getHeight()+getHSpacing()+zoomDial->getWidth(),getHeight());

		return 1;
	}

	long onCanvasPaint(FXObject *sender,FXSelector sel,void *ptr)
	{
		FXColor *data=(FXColor *)canvas->getBackBufferData();


{
	FXDECLARE(CAnalyzer);
public:
	CAnalyzer(FXComposite *parent) :
		FXHorizontalFrame(parent,LAYOUT_RIGHT|LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0, 0,0),
		canvasFrame(new FXVerticalFrame(this,LAYOUT_FIX_WIDTH|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK,0,0,0,0, 2,2,2,2, 0,1)),
			canvas(new FXBackBufferedCanvas(canvasFrame,this,ID_CANVAS,LAYOUT_FILL_X|LAYOUT_FILL_Y)),

		canvasFrame->setWidth(150);
	}

	~CAnalyzer()
	{
		delete statusFont;
	}

	long onZoomDial(FXObject *sender,FXSelector sel,void *ptr)
	{
		zoom=zoomDial->getValue();
		canvas->update(); // not really necessary since we're doing it several times a second anyway
		return 1;
	}

	long onZoomDialDefault(FXObject *sender,FXSelector sel,void *ptr)
	{
		zoomDial->setValue(25);
		return onZoomDial(sender,sel,ptr);
	}

	long onCanvasPaint(FXObject *sender,FXSelector sel,void *ptr)
	{
		FXDC &dc=*((FXDC*)ptr); // back buffered canvases send the DC to draw onto in ptr


		return 1;
	}

	long onCanvasEnter(FXObject *sender,FXSelector sel,void *ptr)
	{
		drawBarFreq=true;
		return onCanvasMotion(sender,sel,ptr);
	}

	long onCanvasLeave(FXObject *sender,FXSelector sel,void *ptr)
	{
		drawBarFreq=false;
		return onCanvasMotion(sender,sel,ptr);
	}

	long onCanvasMotion(FXObject *sender,FXSelector sel,void *ptr)
	{
		barFreqIndex=((FXEvent *)ptr)->win_x/ANALYZER_BAR_WIDTH;
		return 1;

Lines 93-99 Link Here

(-)rezound-0.12.2beta.orig/src/misc/CNestedDataFile/anytype.h (-2 / +2 lines)
93	// I really wished that I didn't have to explicitly use 'vector' in the definition; I'd have like to use any container with an iterator interface	93	// I really wished that I didn't have to explicitly use 'vector' in the definition; I'd have like to use any container with an iterator interface
94	#include <CMutex.h>	94	#include <CMutex.h>
95	#include <CNestedDataFile/CNestedDataFile.h>	95	#include <CNestedDataFile/CNestedDataFile.h>
96	template<class Type> static const vector<Type> &string_to_anytype(const string &str,vector<Type> &ret)	96	template<class Type, class Alloc> static const vector<Type, Alloc> &string_to_anytype(const string &str,vector<Type, Alloc> &ret)
97	{	97	{
98	// This function has to parse '{' ..., ... '}' where the ... can contain nested array	98	// This function has to parse '{' ..., ... '}' where the ... can contain nested array
99	// bodies, quoted strings, numbers, etc; but we only want the outermost list as vector,	99	// bodies, quoted strings, numbers, etc; but we only want the outermost list as vector,
Lines 146-152 Link Here
146		146
147		147
148	// I really wished that I didn't have to explicitly use 'vector' in the definition, I'd have like to use any container with an iterator interface	148	// I really wished that I didn't have to explicitly use 'vector' in the definition, I'd have like to use any container with an iterator interface
149	template<class Type> static const string anytype_to_string(const vector<Type> &any)	149	template<class Type, class Alloc> static const string anytype_to_string(const vector<Type, Alloc> &any)
150	{	150	{
151	string s;	151	string s;
152	size_t l=any.size();	152	size_t l=any.size();




	friend int cfg_parse();
	friend void cfg_init();
	friend void cfg_error(int line,const char *msg);
	template<class type, class alloc> friend const vector<type, alloc> &string_to_anytype(const string &str,vector<type, alloc> &ret);

	friend union cfg_parse_union;
};

void checkForDupMember(int line,const char *key);
int cfg_parse();
void cfg_init();
void cfg_error(int line,const char *msg);

#include "anytype.h"
#include <istring>
template<class type> const type CNestedDataFile::getValue(const string &_key,bool throwIfNotExists) const

Return to bug 141426

Lines 82-88 Link Here

(-)rezound-0.12.2beta.orig/src/frontend_fox/CMetersWindow.cpp (-19 / +19 lines)
82	{	82	{
83	FXDECLARE(CLevelMeter);	83	FXDECLARE(CLevelMeter);
84	public:	84	public:
85	CLevelMeter::CLevelMeter(FXComposite *parent) :	85	CLevelMeter(FXComposite *parent) :
86	FXHorizontalFrame(parent,LAYOUT_FILL_X\|LAYOUT_FIX_HEIGHT\|LAYOUT_TOP \| FRAME_NONE,0,0,0,0, 0,0,0,0, 0,0),	86	FXHorizontalFrame(parent,LAYOUT_FILL_X\|LAYOUT_FIX_HEIGHT\|LAYOUT_TOP \| FRAME_NONE,0,0,0,0, 0,0,0,0, 0,0),
87	statusFont(getApp()->getNormalFont()),	87	statusFont(getApp()->getNormalFont()),
88	canvas(new FXCanvas(this,this,ID_CANVAS,FRAME_NONE \| LAYOUT_FILL_X\|LAYOUT_FILL_Y)),	88	canvas(new FXCanvas(this,this,ID_CANVAS,FRAME_NONE \| LAYOUT_FILL_X\|LAYOUT_FILL_Y)),
Lines 121-127 Link Here
121		121
122	}	122	}
123		123
124	CLevelMeter::~CLevelMeter()	124	~CLevelMeter()
125	{	125	{
126	delete statusFont;	126	delete statusFont;
127	}	127	}
Lines 133-139 Link Here
133	setHeight(max(statusFont->getFontHeight(),MIN_METER_HEIGHT)); // make meter only as tall as necessary (also with a defined minimum)	133	setHeight(max(statusFont->getFontHeight(),MIN_METER_HEIGHT)); // make meter only as tall as necessary (also with a defined minimum)
134	}	134	}
135		135
136	long CLevelMeter::onCanvasPaint(FXObject sender,FXSelector sel,void ptr)	136	long onCanvasPaint(FXObject sender,FXSelector sel,void ptr)
137	{	137	{
138	FXDCWindow dc(canvas);	138	FXDCWindow dc(canvas);
139		139
Lines 327-333 Link Here
327	{	327	{
328	FXDECLARE(CBalanceMeter);	328	FXDECLARE(CBalanceMeter);
329	public:	329	public:
330	CBalanceMeter::CBalanceMeter(FXComposite *parent) :	330	CBalanceMeter(FXComposite *parent) :
331	FXHorizontalFrame(parent,LAYOUT_FILL_X\|LAYOUT_FIX_HEIGHT \| FRAME_NONE, 0,0,0,0, 0,0,0,0, 0,0),	331	FXHorizontalFrame(parent,LAYOUT_FILL_X\|LAYOUT_FIX_HEIGHT \| FRAME_NONE, 0,0,0,0, 0,0,0,0, 0,0),
332	statusFont(getApp()->getNormalFont()),	332	statusFont(getApp()->getNormalFont()),
333	leftLabel(new FXLabel(this,"-1.0")),	333	leftLabel(new FXLabel(this,"-1.0")),
Lines 361-367 Link Here
361		361
362	}	362	}
363		363
364	CBalanceMeter::~CBalanceMeter()	364	~CBalanceMeter()
365	{	365	{
366	delete statusFont;	366	delete statusFont;
367	}	367	}
Lines 372-378 Link Here
372	setHeight(max(statusFont->getFontHeight(),MIN_METER_HEIGHT)); // make meter only as tall as necessary (also with a defined minimum)	372	setHeight(max(statusFont->getFontHeight(),MIN_METER_HEIGHT)); // make meter only as tall as necessary (also with a defined minimum)
373	}	373	}
374		374
375	long CBalanceMeter::onCanvasPaint(FXObject sender,FXSelector sel,void ptr)	375	long onCanvasPaint(FXObject sender,FXSelector sel,void ptr)
376	{	376	{
377	FXDCWindow dc(canvas);	377	FXDCWindow dc(canvas);
378		378
Lines 478-484 Link Here
478	{	478	{
479	FXDECLARE(CStereoPhaseMeter);	479	FXDECLARE(CStereoPhaseMeter);
480	public:	480	public:
481	CStereoPhaseMeter::CStereoPhaseMeter(FXComposite parent,sample_t _samplingBuffer,size_t _samplingNFrames,unsigned _samplingNChannels,unsigned _samplingLeftChannel,unsigned _samplingRightChannel) :	481	CStereoPhaseMeter(FXComposite parent,sample_t _samplingBuffer,size_t _samplingNFrames,unsigned _samplingNChannels,unsigned _samplingLeftChannel,unsigned _samplingRightChannel) :
482	FXHorizontalFrame(parent,LAYOUT_RIGHT\|LAYOUT_FIX_WIDTH\|LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0, 0,0),	482	FXHorizontalFrame(parent,LAYOUT_RIGHT\|LAYOUT_FIX_WIDTH\|LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0, 0,0),
483	canvasFrame(new FXVerticalFrame(this,LAYOUT_FILL_X\|LAYOUT_FILL_Y\|FRAME_SUNKEN\|FRAME_THICK,0,0,0,0, 2,2,2,2, 0,1)),	483	canvasFrame(new FXVerticalFrame(this,LAYOUT_FILL_X\|LAYOUT_FILL_Y\|FRAME_SUNKEN\|FRAME_THICK,0,0,0,0, 2,2,2,2, 0,1)),
484	canvas(new FXBackBufferedCanvas(canvasFrame,this,ID_CANVAS,LAYOUT_FILL_X\|LAYOUT_FILL_Y)),	484	canvas(new FXBackBufferedCanvas(canvasFrame,this,ID_CANVAS,LAYOUT_FILL_X\|LAYOUT_FILL_Y)),
Lines 519-537 Link Here
519	statusFont=new FXFont(getApp(),d);	519	statusFont=new FXFont(getApp(),d);
520	}	520	}
521		521
522	CStereoPhaseMeter::~CStereoPhaseMeter()	522	~CStereoPhaseMeter()
523	{	523	{
524	delete statusFont;	524	delete statusFont;
525	}	525	}
526		526
527	long CStereoPhaseMeter::onZoomDial(FXObject sender,FXSelector sel,void ptr)	527	long onZoomDial(FXObject sender,FXSelector sel,void ptr)
528	{	528	{
529	zoom=((float)zoomDial->getValue())/100.0f;	529	zoom=((float)zoomDial->getValue())/100.0f;
530	canvas->update(); // not really necessary since we're doing it several times a second anyway	530	canvas->update(); // not really necessary since we're doing it several times a second anyway
531	return 1;	531	return 1;
532	}	532	}
533		533
534	long CStereoPhaseMeter::onResize(FXObject sender,FXSelector sel,void ptr)	534	long onResize(FXObject sender,FXSelector sel,void ptr)
535	{	535	{
536	// make square	536	// make square
537	resize(getHeight()+getHSpacing()+zoomDial->getWidth(),getHeight());	537	resize(getHeight()+getHSpacing()+zoomDial->getWidth(),getHeight());
Lines 540-546 Link Here
540	return 1;	540	return 1;
541	}	541	}
542		542
543	long CStereoPhaseMeter::onCanvasPaint(FXObject sender,FXSelector sel,void ptr)	543	long onCanvasPaint(FXObject sender,FXSelector sel,void ptr)
544	{	544	{
545	FXColor data=(FXColor )canvas->getBackBufferData();	545	FXColor data=(FXColor )canvas->getBackBufferData();
546		546
Lines 730-736 Link Here
730	{	730	{
731	FXDECLARE(CAnalyzer);	731	FXDECLARE(CAnalyzer);
732	public:	732	public:
733	CAnalyzer::CAnalyzer(FXComposite *parent) :	733	CAnalyzer(FXComposite *parent) :
734	FXHorizontalFrame(parent,LAYOUT_RIGHT\|LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0, 0,0),	734	FXHorizontalFrame(parent,LAYOUT_RIGHT\|LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0, 0,0),
735	canvasFrame(new FXVerticalFrame(this,LAYOUT_FIX_WIDTH\|LAYOUT_FILL_Y\|FRAME_SUNKEN\|FRAME_THICK,0,0,0,0, 2,2,2,2, 0,1)),	735	canvasFrame(new FXVerticalFrame(this,LAYOUT_FIX_WIDTH\|LAYOUT_FILL_Y\|FRAME_SUNKEN\|FRAME_THICK,0,0,0,0, 2,2,2,2, 0,1)),
736	canvas(new FXBackBufferedCanvas(canvasFrame,this,ID_CANVAS,LAYOUT_FILL_X\|LAYOUT_FILL_Y)),	736	canvas(new FXBackBufferedCanvas(canvasFrame,this,ID_CANVAS,LAYOUT_FILL_X\|LAYOUT_FILL_Y)),
Lines 763-787 Link Here
763	canvasFrame->setWidth(150);	763	canvasFrame->setWidth(150);
764	}	764	}
765		765
766	CAnalyzer::~CAnalyzer()	766	~CAnalyzer()
767	{	767	{
768	delete statusFont;	768	delete statusFont;
769	}	769	}
770		770
771	long CAnalyzer::onZoomDial(FXObject sender,FXSelector sel,void ptr)	771	long onZoomDial(FXObject sender,FXSelector sel,void ptr)
772	{	772	{
773	zoom=zoomDial->getValue();	773	zoom=zoomDial->getValue();
774	canvas->update(); // not really necessary since we're doing it several times a second anyway	774	canvas->update(); // not really necessary since we're doing it several times a second anyway
775	return 1;	775	return 1;
776	}	776	}
777		777
778	long CAnalyzer::onZoomDialDefault(FXObject sender,FXSelector sel,void ptr)	778	long onZoomDialDefault(FXObject sender,FXSelector sel,void ptr)
779	{	779	{
780	zoomDial->setValue(25);	780	zoomDial->setValue(25);
781	return onZoomDial(sender,sel,ptr);	781	return onZoomDial(sender,sel,ptr);
782	}	782	}
783		783
784	long CAnalyzer::onCanvasPaint(FXObject sender,FXSelector sel,void ptr)	784	long onCanvasPaint(FXObject sender,FXSelector sel,void ptr)
785	{	785	{
786	FXDC &dc=((FXDC)ptr); // back buffered canvases send the DC to draw onto in ptr	786	FXDC &dc=((FXDC)ptr); // back buffered canvases send the DC to draw onto in ptr
787		787
Lines 865-883 Link Here
865	return 1;	865	return 1;
866	}	866	}
867		867
868	long CAnalyzer::onCanvasEnter(FXObject sender,FXSelector sel,void ptr)	868	long onCanvasEnter(FXObject sender,FXSelector sel,void ptr)
869	{	869	{
870	drawBarFreq=true;	870	drawBarFreq=true;
871	return onCanvasMotion(sender,sel,ptr);	871	return onCanvasMotion(sender,sel,ptr);
872	}	872	}
873		873
874	long CAnalyzer::onCanvasLeave(FXObject sender,FXSelector sel,void ptr)	874	long onCanvasLeave(FXObject sender,FXSelector sel,void ptr)
875	{	875	{
876	drawBarFreq=false;	876	drawBarFreq=false;
877	return onCanvasMotion(sender,sel,ptr);	877	return onCanvasMotion(sender,sel,ptr);
878	}	878	}
879		879
880	long CAnalyzer::onCanvasMotion(FXObject sender,FXSelector sel,void ptr)	880	long onCanvasMotion(FXObject sender,FXSelector sel,void ptr)
881	{	881	{
882	barFreqIndex=((FXEvent *)ptr)->win_x/ANALYZER_BAR_WIDTH;	882	barFreqIndex=((FXEvent *)ptr)->win_x/ANALYZER_BAR_WIDTH;
883	return 1;	883	return 1;

Lines 155-165 Link Here

(-)rezound-0.12.2beta.orig/src/misc/CNestedDataFile/CNestedDataFile.h (-1 / +6 lines)
155	friend int cfg_parse();	155	friend int cfg_parse();
156	friend void cfg_init();	156	friend void cfg_init();
157	friend void cfg_error(int line,const char *msg);	157	friend void cfg_error(int line,const char *msg);
158	template<class type> friend const vector<type> &string_to_anytype(const string &str,vector<type> &ret);	158	template<class type, class alloc> friend const vector<type, alloc> &string_to_anytype(const string &str,vector<type, alloc> &ret);
159		159
160	friend union cfg_parse_union;	160	friend union cfg_parse_union;
161	};	161	};
162		162
		163	void checkForDupMember(int line,const char *key);
		164	int cfg_parse();
		165	void cfg_init();
		166	void cfg_error(int line,const char *msg);
		167
163	#include "anytype.h"	168	#include "anytype.h"
164	#include <istring>	169	#include <istring>
165	template<class type> const type CNestedDataFile::getValue(const string &_key,bool throwIfNotExists) const	170	template<class type> const type CNestedDataFile::getValue(const string &_key,bool throwIfNotExists) const