summaryrefslogtreecommitdiffstats
path: root/src/sound/AlsaDriver.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/sound/AlsaDriver.cpp')
-rw-r--r--src/sound/AlsaDriver.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/sound/AlsaDriver.cpp b/src/sound/AlsaDriver.cpp
index a0ac79c..921b17f 100644
--- a/src/sound/AlsaDriver.cpp
+++ b/src/sound/AlsaDriver.cpp
@@ -982,7 +982,7 @@ AlsaDriver::createMidiDevice(AlsaPortDescription *port,
int outputPort = checkAlsaError(snd_seq_create_simple_port
(m_midiHandle,
- portName,
+ portName.ascii(),
SND_SEQ_PORT_CAP_READ |
SND_SEQ_PORT_CAP_SUBS_READ,
SND_SEQ_PORT_TYPE_APPLICATION),
@@ -990,7 +990,7 @@ AlsaDriver::createMidiDevice(AlsaPortDescription *port,
if (outputPort >= 0) {
- std::cerr << "CREATED OUTPUT PORT " << outputPort << ":" << portName << " for device " << deviceId << std::endl;
+ std::cerr << "CREATED OUTPUT PORT " << outputPort << ":" << portName.ascii() << " for device " << deviceId << std::endl;
m_outputPorts[deviceId] = outputPort;
@@ -1179,7 +1179,7 @@ AlsaDriver::renameDevice(DeviceId id, TQString name)
}
}
- std::cerr << "Renamed " << m_client << ":" << i->second << " to " << name << std::endl;
+ std::cerr << "Renamed " << m_client << ":" << i->second << " to " << name.ascii() << std::endl;
}
ClientPortPair
@@ -1252,7 +1252,7 @@ void
AlsaDriver::setConnectionToDevice(MappedDevice &device, TQString connection)
{
ClientPortPair pair( -1, -1);
- if (connection && connection != "") {
+ if (!connection.isNull() && connection != "") {
pair = getPortByName(connection.ascii());
}
setConnectionToDevice(device, connection, pair);
@@ -1352,7 +1352,7 @@ AlsaDriver::setPlausibleConnection(DeviceId id, TQString idealConnection)
ClientPortPair port(getPortByName(idealConnection.ascii()));
audit << "AlsaDriver::setPlausibleConnection: connection like "
- << idealConnection << " requested for device " << id << std::endl;
+ << idealConnection.ascii() << " requested for device " << id << std::endl;
if (port.first != -1 && port.second != -1) {
@@ -1610,7 +1610,7 @@ AlsaDriver::setCurrentTimer(TQString timer)
if (timer == getCurrentTimer())
return ;
- std::cerr << "AlsaDriver::setCurrentTimer(" << timer << ")" << std::endl;
+ std::cerr << "AlsaDriver::setCurrentTimer(" << timer.ascii() << ")" << std::endl;
std::string name(timer.ascii());