Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a2755d0 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

Rename MtpCursor to PtpCursor 



Change-Id: I8ce257641388b195f3e17995d323355b19355dc1
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent aef9c05d

media/jni/android_media_PtpCursor.cpp

+4 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include "binder/CursorWindow.h"



#include "MtpClient.h"

#include "MtpCursor.h"

#include "PtpCursor.h"



using namespace android;
@@ -63,7 +63,7 @@ android_media_PtpCursor_setup(JNIEnv *env, jobject thiz, jobject javaClient, 
    }



    MtpClient* client = get_client_from_object(env, javaClient);

    MtpCursor* cursor = new MtpCursor(client, queryType,

    PtpCursor* cursor = new PtpCursor(client, queryType,

            deviceID, storageID, objectID, columnCount, columns);



    if (columns)
@@ -77,7 +77,7 @@ android_media_PtpCursor_finalize(JNIEnv *env, jobject thiz) 
{

#ifdef HAVE_ANDROID_OS

    LOGD("finalize\n");

    MtpCursor *cursor = (MtpCursor *)env->GetIntField(thiz, field_context);

    PtpCursor *cursor = (PtpCursor *)env->GetIntField(thiz, field_context);

    delete cursor;

#endif

}
@@ -93,7 +93,7 @@ android_media_PtpCursor_fill_window(JNIEnv *env, jobject thiz, jobject javaWindo 
                          "Bad CursorWindow");

        return 0;

    }

    MtpCursor *cursor = (MtpCursor *)env->GetIntField(thiz, field_context);

    PtpCursor *cursor = (PtpCursor *)env->GetIntField(thiz, field_context);



    return cursor->fillWindow(window, startPos);

#else

media/mtp/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ include $(CLEAR_VARS) 


LOCAL_SRC_FILES:=                                       \

                  MtpClient.cpp                         \

                  MtpCursor.cpp                         \

                  MtpDataPacket.cpp                     \

                  MtpDebug.cpp                          \

                  MtpDevice.cpp                         \
@@ -38,6 +37,7 @@ LOCAL_SRC_FILES:= \ 
                  MtpStringBuffer.cpp                   \

                  MtpStorage.cpp                        \

                  MtpUtils.cpp                          \

                  PtpCursor.cpp                         \



LOCAL_MODULE:= libmtp

media/mtp/MtpCursor.cpp→media/mtp/PtpCursor.cpp

+23 −23
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ 
 * limitations under the License.

 */



#define LOG_TAG "MtpCursor"

#define LOG_TAG "PtpCursor"



#include "MtpDebug.h"

#include "MtpClient.h"

#include "MtpCursor.h"

#include "PtpCursor.h"

#include "MtpDevice.h"

#include "MtpDeviceInfo.h"

#include "MtpObjectInfo.h"
@@ -30,19 +30,19 @@ 
namespace android {



/* Device Column IDs */

/* These must match the values in MtpCursor.java */

/* These must match the values in PtpCursor.java */

#define DEVICE_ROW_ID           1

#define DEVICE_MANUFACTURER     2

#define DEVICE_MODEL            3



/* Storage Column IDs */

/* These must match the values in MtpCursor.java */

/* These must match the values in PtpCursor.java */

#define STORAGE_ROW_ID          101

#define STORAGE_IDENTIFIER      102

#define STORAGE_DESCRIPTION     103



/* Object Column IDs */

/* These must match the values in MtpCursor.java */

/* These must match the values in PtpCursor.java */

#define OBJECT_ROW_ID               201

#define OBJECT_STORAGE_ID           202

#define OBJECT_FORMAT               203
@@ -65,7 +65,7 @@ namespace android { 
#define OBJECT_KEYWORDS             220

#define OBJECT_THUMB                221



MtpCursor::MtpCursor(MtpClient* client, int queryType, int deviceID,

PtpCursor::PtpCursor(MtpClient* client, int queryType, int deviceID,

                MtpStorageID storageID, MtpObjectHandle objectID,

                int columnCount, int* columns)

        :   mClient(client),
@@ -82,12 +82,12 @@ MtpCursor::MtpCursor(MtpClient* client, int queryType, int deviceID, 
    }

}



MtpCursor::~MtpCursor() {

PtpCursor::~PtpCursor() {

    delete[] mColumns;

}



int MtpCursor::fillWindow(CursorWindow* window, int startPos) {

    LOGD("MtpCursor::fillWindow mQueryType: %d\n", mQueryType);

int PtpCursor::fillWindow(CursorWindow* window, int startPos) {

    LOGD("PtpCursor::fillWindow mQueryType: %d\n", mQueryType);



    switch (mQueryType) {

        case DEVICE:
@@ -107,12 +107,12 @@ int MtpCursor::fillWindow(CursorWindow* window, int startPos) { 
        case OBJECT_CHILDREN:

            return fillObjects(window, mQbjectID, startPos);

        default:

            LOGE("MtpCursor::fillWindow: unknown query type %d\n", mQueryType);

            LOGE("PtpCursor::fillWindow: unknown query type %d\n", mQueryType);

            return 0;

    }

}



int MtpCursor::fillDevices(CursorWindow* window, int startPos) {

int PtpCursor::fillDevices(CursorWindow* window, int startPos) {

    int count = 0;

    MtpDeviceList& deviceList = mClient->getDeviceList();

    for (int i = 0; i < deviceList.size(); i++) {
@@ -127,7 +127,7 @@ int MtpCursor::fillDevices(CursorWindow* window, int startPos) { 
    return count;

}



int MtpCursor::fillDevice(CursorWindow* window, int startPos) {

int PtpCursor::fillDevice(CursorWindow* window, int startPos) {

    MtpDevice* device = mClient->getDevice(mDeviceID);

    if (device && fillDevice(window, device, startPos))

        return 1;
@@ -135,7 +135,7 @@ int MtpCursor::fillDevice(CursorWindow* window, int startPos) { 
        return 0;

}



int MtpCursor::fillStorages(CursorWindow* window, int startPos) {

int PtpCursor::fillStorages(CursorWindow* window, int startPos) {

    int count = 0;

    MtpDevice* device = mClient->getDevice(mDeviceID);

    if (!device)
@@ -157,7 +157,7 @@ int MtpCursor::fillStorages(CursorWindow* window, int startPos) { 
    return count;

}



int MtpCursor::fillStorage(CursorWindow* window, int startPos) {

int PtpCursor::fillStorage(CursorWindow* window, int startPos) {

    MtpDevice* device = mClient->getDevice(mDeviceID);

    if (device && fillStorage(window, device, mStorageID, startPos))

        return 1;
@@ -165,7 +165,7 @@ int MtpCursor::fillStorage(CursorWindow* window, int startPos) { 
        return 0;

}



int MtpCursor::fillObjects(CursorWindow* window, int parent, int startPos) {

int PtpCursor::fillObjects(CursorWindow* window, int parent, int startPos) {

    int count = 0;

    MtpDevice* device = mClient->getDevice(mDeviceID);

    if (!device)
@@ -187,7 +187,7 @@ int MtpCursor::fillObjects(CursorWindow* window, int parent, int startPos) { 
    return count;

}



int MtpCursor::fillObject(CursorWindow* window, int startPos) {

int PtpCursor::fillObject(CursorWindow* window, int startPos) {

    MtpDevice* device = mClient->getDevice(mDeviceID);

    if (device && fillObject(window, device, mQbjectID, startPos))

        return 1;
@@ -195,7 +195,7 @@ int MtpCursor::fillObject(CursorWindow* window, int startPos) { 
        return 0;

}



bool MtpCursor::fillDevice(CursorWindow* window, MtpDevice* device, int row) {

bool PtpCursor::fillDevice(CursorWindow* window, MtpDevice* device, int row) {

    MtpDeviceInfo* deviceInfo = device->getDeviceInfo();

    if (!deviceInfo)

        return false;
@@ -225,7 +225,7 @@ bool MtpCursor::fillDevice(CursorWindow* window, MtpDevice* device, int row) { 
    return true;

}



bool MtpCursor::fillStorage(CursorWindow* window, MtpDevice* device,

bool PtpCursor::fillStorage(CursorWindow* window, MtpDevice* device,

        MtpStorageID storageID, int row) {



LOGD("fillStorage %d\n", storageID);
@@ -273,7 +273,7 @@ fail: 
    return false;

}



bool MtpCursor::fillObject(CursorWindow* window, MtpDevice* device,

bool PtpCursor::fillObject(CursorWindow* window, MtpDevice* device,

        MtpObjectHandle objectID, int row) {



    MtpObjectInfo* objectInfo = device->getObjectInfo(objectID);
@@ -385,7 +385,7 @@ fail: 
    return false;

}



bool MtpCursor::prepareRow(CursorWindow* window) {

bool PtpCursor::prepareRow(CursorWindow* window) {

    if (!window->setNumColumns(mColumnCount)) {

        LOGE("Failed to change column count from %d to %d", window->getNumColumns(), mColumnCount);

        return false;
@@ -399,7 +399,7 @@ bool MtpCursor::prepareRow(CursorWindow* window) { 
}





bool MtpCursor::putLong(CursorWindow* window, int64_t value, int row, int column) {

bool PtpCursor::putLong(CursorWindow* window, int64_t value, int row, int column) {

    if (!window->putLong(row, column, value)) {

        window->freeLastRow();

        LOGE("Failed allocating space for a long in column %d", column);
@@ -408,7 +408,7 @@ bool MtpCursor::putLong(CursorWindow* window, int64_t value, int row, int column 
    return true;

}



bool MtpCursor::putString(CursorWindow* window, const char* text, int row, int column) {

bool PtpCursor::putString(CursorWindow* window, const char* text, int row, int column) {

    int size = strlen(text) + 1;

    int offset = window->alloc(size);

    if (!offset) {
@@ -427,7 +427,7 @@ bool MtpCursor::putString(CursorWindow* window, const char* text, int row, int c 
    return true;

}



bool MtpCursor::putThumbnail(CursorWindow* window, MtpObjectHandle objectID,

bool PtpCursor::putThumbnail(CursorWindow* window, MtpObjectHandle objectID,

                            MtpObjectFormat format, int row, int column) {

    MtpDevice* device = mClient->getDevice(mDeviceID);

    void* thumbnail;

media/mtp/MtpCursor.h→media/mtp/PtpCursor.h

+6 −6
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
 * limitations under the License.

 */



#ifndef _MTP_CURSOR_H

#define _MTP_CURSOR_H

#ifndef _PTP_CURSOR_H

#define _PTP_CURSOR_H



#include "MtpTypes.h"
@@ -23,7 +23,7 @@ namespace android { 


class CursorWindow;



class MtpCursor {

class PtpCursor {

private:

    enum {

        DEVICE              = 1,
@@ -45,10 +45,10 @@ private: 
    int*            mColumns;



public:

                MtpCursor(MtpClient* client, int queryType, int deviceID,

                PtpCursor(MtpClient* client, int queryType, int deviceID,

                        MtpStorageID storageID, MtpObjectHandle objectID,

                        int columnCount, int* columns);

    virtual     ~MtpCursor();

    virtual     ~PtpCursor();



    int         fillWindow(CursorWindow* window, int startPos);
@@ -75,4 +75,4 @@ private: 


}; // namespace android



#endif // _MTP_CURSOR_H
 
#endif // _PTP_CURSOR_H