summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiemm/osoundsystem.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libopie2/opiemm/osoundsystem.cpp b/libopie2/opiemm/osoundsystem.cpp
index 07f26c0..c00585d 100644
--- a/libopie2/opiemm/osoundsystem.cpp
+++ b/libopie2/opiemm/osoundsystem.cpp
@@ -102,97 +102,97 @@ int OSoundSystem::count() const
102OSoundCard* OSoundSystem::card( const QString& iface ) const 102OSoundCard* OSoundSystem::card( const QString& iface ) const
103{ 103{
104 return _interfaces[iface]; 104 return _interfaces[iface];
105} 105}
106 106
107 107
108OSoundSystem* OSoundSystem::instance() 108OSoundSystem* OSoundSystem::instance()
109{ 109{
110 if ( !_instance ) _instance = new OSoundSystem(); 110 if ( !_instance ) _instance = new OSoundSystem();
111 return _instance; 111 return _instance;
112} 112}
113 113
114 114
115OSoundSystem::CardIterator OSoundSystem::iterator() const 115OSoundSystem::CardIterator OSoundSystem::iterator() const
116{ 116{
117 return OSoundSystem::CardIterator( _interfaces ); 117 return OSoundSystem::CardIterator( _interfaces );
118} 118}
119 119
120 120
121/*====================================================================================== 121/*======================================================================================
122 * OSoundCard 122 * OSoundCard
123 *======================================================================================*/ 123 *======================================================================================*/
124 124
125OSoundCard::OSoundCard( QObject* parent, const char* name ) 125OSoundCard::OSoundCard( QObject* parent, const char* name )
126 :QObject( parent, name ), _audio( 0 ), _mixer( 0 ) 126 :QObject( parent, name ), _audio( 0 ), _mixer( 0 )
127{ 127{
128 odebug << "OSoundCard::OSoundCard()" << oendl; 128 odebug << "OSoundCard::OSoundCard()" << oendl;
129 init(); 129 init();
130} 130}
131 131
132 132
133OSoundCard::~OSoundCard() 133OSoundCard::~OSoundCard()
134{ 134{
135} 135}
136 136
137 137
138void OSoundCard::init() 138void OSoundCard::init()
139{ 139{
140 _audio = new OAudioInterface( this, "/dev/dsp" ); 140 _audio = new OAudioInterface( this, "/dev/dsp" );
141 _mixer = new OMixerInterface( this, "/dev/mixer" ); 141 _mixer = new OMixerInterface( this, "/dev/mixer" );
142} 142}
143 143
144 144
145/*====================================================================================== 145/*======================================================================================
146 * OAudioInterface 146 * OAudioInterface
147 *======================================================================================*/ 147 *======================================================================================*/
148 148
149OAudioInterface::OAudioInterface( QObject* parent, const char* name ) 149OAudioInterface::OAudioInterface( QObject* parent, const char* name )
150 :QObject( parent, name ) 150 :QObject( parent, name ), _sfd(0)
151{ 151{
152 odebug << "OAudioInterface::OAudioInterface()" << oendl; 152 odebug << "OAudioInterface::OAudioInterface()" << oendl;
153 init(); 153 init();
154} 154}
155 155
156 156
157OAudioInterface::~OAudioInterface() 157OAudioInterface::~OAudioInterface()
158{ 158{
159} 159}
160 160
161 161
162void OAudioInterface::init() 162void OAudioInterface::init()
163{ 163{
164 164
165 165
166} 166}
167 167
168 168
169/*====================================================================================== 169/*======================================================================================
170 * OMixerInterface 170 * OMixerInterface
171 *======================================================================================*/ 171 *======================================================================================*/
172 172
173OMixerInterface::OMixerInterface( QObject* parent, const char* name ) 173OMixerInterface::OMixerInterface( QObject* parent, const char* name )
174 :QObject( parent, name ) 174 :QObject( parent, name )
175{ 175{
176 odebug << "OMixerInterface::OMixerInterface()" << oendl; 176 odebug << "OMixerInterface::OMixerInterface()" << oendl;
177 init(); 177 init();
178} 178}
179 179
180 180
181OMixerInterface::~OMixerInterface() 181OMixerInterface::~OMixerInterface()
182{ 182{
183} 183}
184 184
185 185
186void OMixerInterface::init() 186void OMixerInterface::init()
187{ 187{
188 // open the device 188 // open the device
189 _fd = ::open( name(), O_RDWR ); 189 _fd = ::open( name(), O_RDWR );
190 if ( _fd == -1 ) 190 if ( _fd == -1 )
191 { 191 {
192 owarn << "OMixerInterface::init(): Can't open mixer." << oendl; 192 owarn << "OMixerInterface::init(): Can't open mixer." << oendl;
193 return; 193 return;
194 } 194 }
195 195
196 // construct the device capabilities 196 // construct the device capabilities
197 int devmask = 0; 197 int devmask = 0;
198 if ( ioctl( _fd, SOUND_MIXER_READ_DEVMASK, &devmask ) != -1 ) 198 if ( ioctl( _fd, SOUND_MIXER_READ_DEVMASK, &devmask ) != -1 )