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

Removed dead code and added some logging.

Browse Source
This commit is contained in:
codestation
2013-08-13 11:47:16 -04:30
parent 6b17d2bc94
commit 0d8c0a2b24
5 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmaclient.cpp
View File

@@ -67,8 +67,6 @@ void CmaClient::enterEventLoop()
break;
}
qDebug("Event 0x%04X recieved", event.Code);
switch(event.Code) {
case PTP_EC_VITA_RequestSendNumOfObject:
vitaEventSendNumOfObject(&event, event.Param1);
@@ -353,7 +351,7 @@ void CmaClient::vitaEventSendObjectMetadata(vita_event_t *event, int eventId)
metadata_t *meta;
int count = db->filterObjects(browse.ohfiParent, &meta); // if meta is null, will return empty XML
qDebug("Sending %i metadata filtered objects for OHFI %id", count, browse.ohfiParent);
qDebug("Sending %i metadata filtered objects for OHFI %d", count, browse.ohfiParent);
if(VitaMTP_SendObjectMetadata(device, eventId, meta) != PTP_RC_OK) { // send all objects with OHFI parent
qWarning("Sending metadata for OHFI parent %d failed", browse.ohfiParent);
@@ -433,6 +431,7 @@ void CmaClient::vitaEventCancelTask(vita_event_t *event, int eventId)
int eventIdToCancel = event->Param2;
VitaMTP_CancelTask(device, eventIdToCancel);
qWarning("Event CancelTask (0x%x) unimplemented!", event->Code);
connected = false;
}
void CmaClient::vitaEventSendHttpObjectFromURL(vita_event_t *event, int eventId)

4
cmaobject.cpp
View File

@@ -172,9 +172,7 @@ void CMAObject::initObject(const QFileInfo &file)
metadata.name = strdup(file.fileName().toUtf8().data());
metadata.ohfiParent = parent->metadata.ohfi;
metadata.ohfi = ohfi_count++;
if(metadata.ohfi == 1494) {
metadata.ohfi = metadata.ohfi;
}
metadata.type = VITA_DIR_TYPE_MASK_REGULAR; // ignored for files
metadata.dateTimeCreated = file.created().toTime_t();
metadata.size = file.size();

18
cmarootobject.cpp
View File

@@ -34,6 +34,15 @@ void CMARootObject::initObject(const QString &path)
metadata.type = VITA_DIR_TYPE_MASK_ROOT | VITA_DIR_TYPE_MASK_REGULAR;
switch(root_ohfi) {
case VITA_OHFI_MUSIC:
metadata.dataType = Music;
this->path = path;
num_filters = 1;
filters = new metadata_t[1];
//createFilter(&filters[0], "Folders", VITA_DIR_TYPE_MASK_MUSIC | VITA_DIR_TYPE_MASK_ROOT | VITA_DIR_TYPE_MASK_PLAYLISTS);
createFilter(&filters[0], "All", VITA_DIR_TYPE_MASK_MUSIC | VITA_DIR_TYPE_MASK_ROOT | VITA_DIR_TYPE_MASK_SONGS);
break;
case VITA_OHFI_PHOTO:
metadata.dataType = Photo;
this->path = path;
@@ -52,15 +61,6 @@ void CMARootObject::initObject(const QString &path)
createFilter(&filters[1], "All", VITA_DIR_TYPE_MASK_VIDEO | VITA_DIR_TYPE_MASK_ROOT | VITA_DIR_TYPE_MASK_ALL);
break;
case VITA_OHFI_MUSIC:
metadata.dataType = Music;
this->path = path;
num_filters = 1;
filters = new metadata_t[1];
//createFilter(&filters[0], "Folders", VITA_DIR_TYPE_MASK_MUSIC | VITA_DIR_TYPE_MASK_ROOT | VITA_DIR_TYPE_MASK_PLAYLISTS);
createFilter(&filters[0], "All", VITA_DIR_TYPE_MASK_MUSIC | VITA_DIR_TYPE_MASK_ROOT | VITA_DIR_TYPE_MASK_SONGS);
break;
case VITA_OHFI_VITAAPP:
metadata.dataType = App;
this->path = QDir(QDir(path).absoluteFilePath("APP")).absoluteFilePath(uuid);

2
main.cpp
View File

@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
qInstallMsgHandler(noMessageOutput);
#endif
} else {
VitaMTP_Set_Logging(VitaMTP_DEBUG);
VitaMTP_Set_Logging(VitaMTP_VERBOSE);
}
qDebug()<<"From main thread: "<<QThread::currentThreadId();

3
mainwidget.cpp
View File

@@ -76,7 +76,8 @@ void MainWidget::refreshDatabase()
{
db.mutex.lock();
db.destroy();
db.create();
int count = db.create();
qDebug("Indexed %i elements in the database", count);
db.mutex.unlock();
}