LADI
/
ladish
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor cleanups, removed braindead centralized singleton instance file 

git-svn-id: http://svn.drobilla.net/lad@86 a436a847-0d15-0410-975c-d299462d15a1
This commit is contained in:
dave 2006-07-12 01:01:15 +00:00
parent 9627854912
commit 44dd31f131
7 changed files with 14 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ingen/src/libs/client/Store.cpp
View File

@ -25,6 +25,11 @@
namespace LibOmClient {
/// Singleton instance
Store* Store::_instance = 0;
Store::Store(SigClientInterface& emitter)
{
//emitter.new_plugin_sig.connect(sigc::mem_fun(this, &Store::add_plugin));

3
ingen/src/libs/engine/JackAudioDriver.cpp
View File

@ -51,7 +51,6 @@ JackAudioPort::JackAudioPort(JackAudioDriver* driver, DuplexPort<sample>* patch_
m_driver(driver),
m_jack_port(NULL),
m_jack_buffer(NULL),
//m_jack_buffer(NULL),
m_patch_port(patch_port)
{
//assert(patch_port->tied_port() != NULL);
@ -62,8 +61,6 @@ JackAudioPort::JackAudioPort(JackAudioDriver* driver, DuplexPort<sample>* patch_
(patch_port->is_input()) ? JackPortIsInput : JackPortIsOutput,
0);
//m_jack_buffer = new DriverBuffer<jack_sample_t>(driver->buffer_size());
patch_port->fixed_buffers(true);
}

3
ingen/src/libs/engine/JackAudioDriver.h
View File

@ -49,8 +49,6 @@ public:
void prepare_buffer(jack_nframes_t nframes);
jack_port_t* jack_port() const { return m_jack_port; }
//DriverBuffer<sample>* buffer() const { return m_jack_buffer; }
//void jack_buffer(jack_sample_t* s) { m_jack_buffer->set_data(s); }
DuplexPort<sample>* patch_port() const { return m_patch_port; }
private:
@ -61,7 +59,6 @@ private:
JackAudioDriver* m_driver;
jack_port_t* m_jack_port;
jack_sample_t* m_jack_buffer; ///< Cached for output ports
//DriverBuffer<sample>* m_jack_buffer;
DuplexPort<sample>* m_patch_port;
};

5
ingen/src/progs/ingenuity/App.cpp
View File

@ -55,6 +55,11 @@ namespace OmGtk {
class OmPort;
/// Singleton instance
App* App::_instance = 0;
App::App()
: m_configuration(new Configuration()),
m_about_dialog(NULL),

4
ingen/src/progs/ingenuity/Controller.cpp
View File

@ -26,6 +26,10 @@
namespace OmGtk {
/// Singleton instance
Controller* Controller::_instance = 0;
Controller::Controller(const string& engine_url)
: OSCModelEngineInterface(engine_url),
m_patch_librarian(new PatchLibrarian(this)),

1
ingen/src/progs/ingenuity/Makefile.am
View File

@ -16,7 +16,6 @@ ingenuity_SOURCES = \
cmdline.h \
cmdline.c \
main.cpp \
singletons.cpp \
ConnectWindow.h \
ConnectWindow.cpp \
App.h \

27
ingen/src/progs/ingenuity/singletons.cpp
View File

@ -1,27 +0,0 @@
/* This file is part of Om. Copyright (C) 2006 Dave Robillard.
*
* Om is free software; you can redistribute it and/or modify it under the
* terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later
* version.
*
* Om is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "App.h"
#include "Store.h"
#include "Controller.h"
namespace OmGtk
{
App* App::_instance = 0;
Store* Store::_instance = 0;
Controller* Controller::_instance = 0;
}