[Wired-commits] wired/src/plugins/wahwah WahwahPlug.cpp,1.13,1.14 WahwahPlug.h,1.8,1.9

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/wired/wired/src/plugins/wahwah
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15058/src/plugins/wahwah

Modified Files:
	WahwahPlug.cpp WahwahPlug.h 
Log Message:
Unicode Compliant

Index: WahwahPlug.h
===================================================================
RCS file: /cvsroot/wired/wired/src/plugins/wahwah/WahwahPlug.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** WahwahPlug.h	1 Feb 2006 14:20:27 -0000	1.8
--- WahwahPlug.h	17 Mar 2006 22:34:23 -0000	1.9
***************
*** 18,28 ****

! #define		PLUGIN_NAME	"Wahwah"

  /* Desssin */
! #define		IMG_WW_BG	"plugins/wahwah/wah-wah_bg.png"
! #define		IMG_WW_BMP	"plugins/wahwah/ReverbPlug.bmp"
! #define		IMG_WW_FADER_BG	"plugins/wahwah/fader_bg.png"
! #define		IMG_WW_FADER_FG	"plugins/wahwah/fader_button.png"

  /* Initialisation */
--- 18,28 ----

! #define		PLUGIN_NAME	wxT("Wahwah")

  /* Desssin */
! #define		IMG_WW_BG	wxT("plugins/wahwah/wah-wah_bg.png")
! #define		IMG_WW_BMP	wxT("plugins/wahwah/ReverbPlug.bmp")
! #define		IMG_WW_FADER_BG	wxT("plugins/wahwah/fader_bg.png")
! #define		IMG_WW_FADER_FG	wxT("plugins/wahwah/fader_button.png")

  /* Initialisation */
***************
*** 69,76 ****
  #define STR_RESOLUTION _("Resolution")

! #define IMG_LIQUID_ON	"plugins/reverb/liquid-cristal_play.png"
! #define IMG_LIQUID_OFF	"plugins/reverb/liquid-cristal_stop.png"
! #define IMG_BYPASS_ON	"plugins/reverb/bypass_button_down.png"
! #define IMG_BYPASS_OFF	"plugins/reverb/bypass_button_up.png"

--- 69,76 ----
  #define STR_RESOLUTION _("Resolution")

! #define IMG_LIQUID_ON	wxT("plugins/reverb/liquid-cristal_play.png")
! #define IMG_LIQUID_OFF	wxT("plugins/reverb/liquid-cristal_stop.png")
! #define IMG_BYPASS_ON	wxT("plugins/reverb/bypass_button_down.png")
! #define IMG_BYPASS_OFF	wxT("plugins/reverb/bypass_button_up.png")

***************
*** 118,122 ****
    bool	 IsMidi();

!   std::string DefaultName() { return "Wahwah"; }

    void	OnFrequency(wxScrollEvent &e);
--- 118,122 ----
    bool	 IsMidi();

!   wxString DefaultName() { return wxT("Wahwah"); }

    void	OnFrequency(wxScrollEvent &e);

Index: WahwahPlug.cpp
===================================================================
RCS file: /cvsroot/wired/wired/src/plugins/wahwah/WahwahPlug.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** WahwahPlug.cpp	6 Mar 2006 03:04:33 -0000	1.13
--- WahwahPlug.cpp	17 Mar 2006 22:34:23 -0000	1.14
***************
*** 29,47 ****

    wxImage *tr_bg = 
!     new wxImage(string(GetDataDir() + string(IMG_WW_BG)).c_str(), 
  		wxBITMAP_TYPE_PNG);
    TpBmp = new wxBitmap(tr_bg);
    SetSize(-1, -1, 400, 100);
!   bmp = new wxBitmap(string(GetDataDir() + string(IMG_WW_BMP)).c_str(), 
  		     wxBITMAP_TYPE_BMP);
!   img_bg = new wxImage(string(GetDataDir() + string(IMG_WW_FADER_BG)).c_str(),
  		       wxBITMAP_TYPE_PNG);
!   img_fg = new wxImage(string(GetDataDir() + string(IMG_WW_FADER_FG)).c_str(),
  		       wxBITMAP_TYPE_PNG);
    bypass_on = 
!     new wxImage(string(GetDataDir() + string(IMG_BYPASS_ON)).c_str(),
  		wxBITMAP_TYPE_PNG);
    bypass_off = 
!     new wxImage(string(GetDataDir() + string(IMG_BYPASS_OFF)).c_str(), 
  		wxBITMAP_TYPE_PNG);
    BypassBtn = 
--- 29,47 ----

    wxImage *tr_bg = 
!     new wxImage(GetDataDir() + wxString(IMG_WW_BG), 
  		wxBITMAP_TYPE_PNG);
    TpBmp = new wxBitmap(tr_bg);
    SetSize(-1, -1, 400, 100);
!   bmp = new wxBitmap(GetDataDir() + wxString(IMG_WW_BMP), 
  		     wxBITMAP_TYPE_BMP);
!   img_bg = new wxImage(GetDataDir() + wxString(IMG_WW_FADER_BG),
  		       wxBITMAP_TYPE_PNG);
!   img_fg = new wxImage(GetDataDir() + wxString(IMG_WW_FADER_FG),
  		       wxBITMAP_TYPE_PNG);
    bypass_on = 
!     new wxImage(GetDataDir() + wxString(IMG_BYPASS_ON),
  		wxBITMAP_TYPE_PNG);
    bypass_off = 
!     new wxImage(GetDataDir() + wxString(IMG_BYPASS_OFF), 
  		wxBITMAP_TYPE_PNG);
    BypassBtn = 
***************
*** 70,77 ****
  			   this, GetPosition() + wxPoint(320, 35));

!   liquid_on = new wxImage(string(GetDataDir() + string(IMG_LIQUID_ON)).c_str(),
  			  wxBITMAP_TYPE_PNG);
    liquid_off = 
!     new wxImage(string(GetDataDir() + string(IMG_LIQUID_OFF)).c_str(), 
  		wxBITMAP_TYPE_PNG);
    Liquid = new StaticBitmap(this, -1, wxBitmap(liquid_on), wxPoint(22, 25));
--- 70,77 ----
  			   this, GetPosition() + wxPoint(320, 35));

!   liquid_on = new wxImage(GetDataDir() + wxString(IMG_LIQUID_ON),
  			  wxBITMAP_TYPE_PNG);
    liquid_off = 
!     new wxImage(GetDataDir() + wxString(IMG_LIQUID_OFF), 
  		wxBITMAP_TYPE_PNG);
    Liquid = new StaticBitmap(this, -1, wxBitmap(liquid_on), wxPoint(22, 25));
***************
*** 266,286 ****
     	WahwahMutex.Lock();		
     	// cout << "Good Load" << endl;
! 	buffer = strdup(Datas.LoadValue(std::string(STR_RESOLUTION)));
  	if (buffer != NULL)
  		param.res = strtof(buffer, NULL);
  	free(buffer);
! 	buffer = strdup(Datas.LoadValue(std::string(STR_FREQUENCY)));
  	if (buffer != NULL)
  		param.freq = strtof(buffer, NULL);
  	free(buffer);
! 	buffer = strdup(Datas.LoadValue(std::string(STR_START_PHASE)));
  	if (buffer != NULL)
  		param.startphase = strtof(buffer, NULL);
  	free(buffer);
! 	buffer = strdup(Datas.LoadValue(std::string(STR_DEPTH)));
  	if (buffer != NULL)
  		param.depth = strtof(buffer, NULL);
  	free(buffer);
! 	buffer = strdup(Datas.LoadValue(std::string(STR_FREQUENCY_OFS)));
  	if (buffer != NULL)
  		param.freqofs = strtof(buffer, NULL);
--- 266,286 ----
     	WahwahMutex.Lock();		
     	// cout << "Good Load" << endl;
! 	buffer = strdup(Datas.LoadValue(wxString(STR_RESOLUTION)));
  	if (buffer != NULL)
  		param.res = strtof(buffer, NULL);
  	free(buffer);
! 	buffer = strdup(Datas.LoadValue(wxString(STR_FREQUENCY)));
  	if (buffer != NULL)
  		param.freq = strtof(buffer, NULL);
  	free(buffer);
! 	buffer = strdup(Datas.LoadValue(wxString(STR_START_PHASE)));
  	if (buffer != NULL)
  		param.startphase = strtof(buffer, NULL);
  	free(buffer);
! 	buffer = strdup(Datas.LoadValue(wxString(STR_DEPTH)));
  	if (buffer != NULL)
  		param.depth = strtof(buffer, NULL);
  	free(buffer);
! 	buffer = strdup(Datas.LoadValue(wxString(STR_FREQUENCY_OFS)));
  	if (buffer != NULL)
  		param.freqofs = strtof(buffer, NULL);
***************
*** 307,323 ****

  		oss << params->freq;
! 		Datas.SaveValue(std::string(STR_FREQUENCY), std::string(oss.str()));
  		oss.seekp(ios_base::beg);
  		oss << params->startphase;
! 		Datas.SaveValue(std::string(STR_START_PHASE), std::string(oss.str()));
  		oss.seekp(ios_base::beg);
  		oss << params->depth;
! 		Datas.SaveValue(std::string(STR_DEPTH), std::string(oss.str()));
  		oss.seekp(ios_base::beg);
  		oss << params->freqofs;
! 		Datas.SaveValue(std::string(STR_FREQUENCY_OFS), std::string(oss.str()));
  		oss.seekp(ios_base::beg);
  		oss << params->res;
! 		Datas.SaveValue(std::string(STR_RESOLUTION), std::string(oss.str()));
  		oss.seekp(ios_base::beg);		
  	}
--- 307,323 ----

  		oss << params->freq;
! 		Datas.SaveValue(wxString(STR_FREQUENCY), (char *)oss.str().c_str());
  		oss.seekp(ios_base::beg);
  		oss << params->startphase;
! 		Datas.SaveValue(wxString(STR_START_PHASE), (char *)oss.str().c_str());
  		oss.seekp(ios_base::beg);
  		oss << params->depth;
! 		Datas.SaveValue(wxString(STR_DEPTH), (char *)oss.str().c_str());
  		oss.seekp(ios_base::beg);
  		oss << params->freqofs;
! 		Datas.SaveValue(wxString(STR_FREQUENCY_OFS), (char *)oss.str().c_str());
  		oss.seekp(ios_base::beg);
  		oss << params->res;
! 		Datas.SaveValue(wxString(STR_RESOLUTION), (char *)oss.str().c_str());
  		oss.seekp(ios_base::beg);		
  	}