Commit 9066f85b authored by sletz's avatar sletz
Browse files

Rename JackDriver::Init method to JackDriver::Initialize (to avoid confusion...

Rename JackDriver::Init method to JackDriver::Initialize (to avoid confusion with JackThread::Init method).

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3599 0c269be4-1314-0410-8aa9-9f06e86f4224
parent 1f357b86
......@@ -25,6 +25,10 @@ Paul Davis
Jackdmp changes log
---------------------------
2009-07-16 Stephane Letz <letz@grame.fr>
* Rename JackDriver::Init method to JackDriver::Initialize (to avoid confusion with JackThread::Init method).
2009-07-11 Stephane Letz <letz@grame.fr>
* Raise drivers time out used in synchronous mode.
......
......@@ -339,7 +339,7 @@ int JackDriver::SetSampleRate(jack_nframes_t sample_rate)
return 0;
}
bool JackDriver::Init()
bool JackDriver::Initialize()
{
return true;
}
......
......@@ -203,7 +203,7 @@ class SERVER_EXPORT JackDriver : public JackDriverClientInterface
virtual JackClientControl* GetClientControl() const;
virtual bool IsRealTime() const;
virtual bool Init(); // To be called by the wrapping thread Init method when the driver is a "blocking" one
virtual bool Initialize(); // To be called by the wrapping thread Init method when the driver is a "blocking" one
};
......
......@@ -121,13 +121,13 @@ namespace Jack
as a "dummy driver, until Init method returns.
*/
bool JackNetDriver::Init()
bool JackNetDriver::Initialize()
{
jack_log ( "JackNetDriver::Init()" );
jack_log("JackNetDriver::Initialize()");
//new loading, but existing socket, restart the driver
if (fSocket.IsSocket()) {
jack_info( "Restarting driver..." );
jack_info("Restarting driver...");
FreeAll();
}
......
......@@ -50,7 +50,7 @@ namespace Jack
JackGnuPlotMonitor<float>* fNetTimeMon;
#endif
bool Init();
bool Initialize();
void FreeAll();
int AllocPorts();
......
......@@ -209,7 +209,7 @@ bool JackThreadedDriver::Execute()
bool JackThreadedDriver::Init()
{
if (fDriver->Init()) {
if (fDriver->Initialize()) {
if (fDriver->IsRealTime()) {
jack_log("JackThreadedDriver::Init IsRealTime");
// Will do "something" on OSX only...
......
......@@ -65,7 +65,7 @@ class SERVER_EXPORT JackWaitThreadedDriver : public JackThreadedDriver
bool Execute()
{
// Blocks until decorated driver is started (that is when it's Init method returns).
fDriver->Init();
fDriver->Initialize();
fRunning = true;
return false;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment