easthighNerd/qcma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not override the protocol version if the user sets a low value.

Browse Source 
Set the custom protocol version on the wireless broadcast too.
This commit is contained in:
codestation
2014-10-09 19:14:37 -04:30
parent 761bcac8aa
commit a73000c329
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/capability.cpp
View File

@@ -42,7 +42,6 @@ bool DeviceCapability::exchangeInfo(vita_device_t *device)
QString hostname = QHostInfo::localHostName(); QString hostname = QHostInfo::localHostName();
int protocol_version = QSettings().value("protocolVersion", VITAMTP_PROTOCOL_MAX_VERSION).toInt(); int protocol_version = QSettings().value("protocolVersion", VITAMTP_PROTOCOL_MAX_VERSION).toInt();
protocol_version = qMax(protocol_version, VITAMTP_PROTOCOL_MAX_VERSION);
const initiator_info_t *pc_info = VitaMTP_Data_Initiator_New(hostname.toUtf8().data(), protocol_version); const initiator_info_t *pc_info = VitaMTP_Data_Initiator_New(hostname.toUtf8().data(), protocol_version);
// Next, we send the client's (this program) info (discard the const here) // Next, we send the client's (this program) info (discard the const here)

8
src/cmabroadcast.cpp
View File

@@ -85,10 +85,12 @@ void CmaBroadcast::readPendingDatagrams()
void CmaBroadcast::setAvailable() void CmaBroadcast::setAvailable()
{ {
QMutexLocker locker(&mutex); QMutexLocker locker(&mutex);
int protocol_version = QSettings().value("protocolVersion", VITAMTP_PROTOCOL_MAX_VERSION).toInt();
reply.clear(); reply.clear();
reply.insert(0, broadcast_reply reply.insert(0, broadcast_reply
.arg(broadcast_ok, uuid, "win", hostname) .arg(broadcast_ok, uuid, "win", hostname)
.arg(VITAMTP_PROTOCOL_MAX_VERSION, 8, 10, QChar('0')) .arg(protocol_version, 8, 10, QChar('0'))
.arg(QCMA_REQUEST_PORT) .arg(QCMA_REQUEST_PORT)
.arg(VITAMTP_WIRELESS_MAX_VERSION, 8, 10, QChar('0'))); .arg(VITAMTP_WIRELESS_MAX_VERSION, 8, 10, QChar('0')));
reply.append('\0'); reply.append('\0');
@@ -97,10 +99,12 @@ void CmaBroadcast::setAvailable()
void CmaBroadcast::setUnavailable() void CmaBroadcast::setUnavailable()
{ {
QMutexLocker locker(&mutex); QMutexLocker locker(&mutex);
int protocol_version = QSettings().value("protocolVersion", VITAMTP_PROTOCOL_MAX_VERSION).toInt();
reply.clear(); reply.clear();
reply.insert(0, broadcast_reply reply.insert(0, broadcast_reply
.arg(broadcast_unavailable, uuid, "win", hostname) .arg(broadcast_unavailable, uuid, "win", hostname)
.arg(VITAMTP_PROTOCOL_MAX_VERSION, 8, 10, QChar('0')) .arg(protocol_version, 8, 10, QChar('0'))
.arg(QCMA_REQUEST_PORT) .arg(QCMA_REQUEST_PORT)
.arg(VITAMTP_WIRELESS_MAX_VERSION, 8, 10, QChar('0'))); .arg(VITAMTP_WIRELESS_MAX_VERSION, 8, 10, QChar('0')));
reply.append('\0'); reply.append('\0');

4
src/forms/configwidget.cpp
View File

@@ -101,8 +101,6 @@ void ConfigWidget::setDefaultData()
ui->musicSkipCheck->setChecked(settings.value("musicSkip", false).toBool()); ui->musicSkipCheck->setChecked(settings.value("musicSkip", false).toBool());
int protocol_version = settings.value("protocolVersion", VITAMTP_PROTOCOL_MAX_VERSION).toInt(); int protocol_version = settings.value("protocolVersion", VITAMTP_PROTOCOL_MAX_VERSION).toInt();
protocol_version = qMax(protocol_version, VITAMTP_PROTOCOL_MAX_VERSION);
ui->protocolEdit->setText(QString::number(protocol_version)); ui->protocolEdit->setText(QString::number(protocol_version));
} }
@@ -190,7 +188,7 @@ void ConfigWidget::accept()
settings.setValue("photoSkip", ui->photoSkipCheck->isChecked()); settings.setValue("photoSkip", ui->photoSkipCheck->isChecked());
settings.setValue("videoSkip", ui->videoSkipCheck->isChecked()); settings.setValue("videoSkip", ui->videoSkipCheck->isChecked());
settings.setValue("musicSkip", ui->musicSkipCheck->isChecked()); settings.setValue("musicSkip", ui->musicSkipCheck->isChecked());
settings.setValue("protocolVersion", ui->protocolEdit->text().toLongLong()); settings.setValue("protocolVersion", ui->protocolEdit->text().toInt());
settings.sync(); settings.sync();
done(Accepted); done(Accepted);