diff options
Diffstat (limited to 'media/jni/mediaeditor/VideoEditorPropertiesMain.cpp')
| -rwxr-xr-x | media/jni/mediaeditor/VideoEditorPropertiesMain.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/media/jni/mediaeditor/VideoEditorPropertiesMain.cpp b/media/jni/mediaeditor/VideoEditorPropertiesMain.cpp index 3b795ce..9de7207 100755 --- a/media/jni/mediaeditor/VideoEditorPropertiesMain.cpp +++ b/media/jni/mediaeditor/VideoEditorPropertiesMain.cpp @@ -34,13 +34,11 @@ extern "C" { #include <M4OSA_FileReader.h> #include <M4OSA_FileWriter.h> #include <M4OSA_Memory.h> -#include <M4OSA_String.h> #include <M4OSA_Thread.h> #include <M4VSS3GPP_API.h> #include <M4VSS3GPP_ErrorCodes.h> #include <M4MCS_API.h> #include <M4MCS_ErrorCodes.h> -#include <M4MDP_API.h> #include <M4READER_Common.h> #include <M4WRITER_common.h> #include <M4DECODER_Common.h> @@ -147,8 +145,8 @@ jobject videoEditProp_getProperties( if (gotten) { // Retrieve the extension. - result = M4OSA_chrReverseFindChar(pFile, '.', &pExtension); - if ((M4NO_ERROR == result) && (M4OSA_NULL != pExtension)) + pExtension = (M4OSA_Char *)strrchr((const char *)pFile, (int)'.'); + if (M4OSA_NULL != pExtension) { // Skip the dot. pExtension++; @@ -341,7 +339,7 @@ static void getFileAndMediaTypeFromExtension ( M4OSA_UInt32 index = 0; M4OSA_ERR result = M4NO_ERROR; M4OSA_Int32 cmpResult = 0; - M4OSA_UInt32 extLength = M4OSA_chrLength(pExtension); + M4OSA_UInt32 extLength = strlen((const char *)pExtension); // Assign default *pFileType = VideoEditClasses_kFileType_Unsupported; @@ -353,7 +351,7 @@ static void getFileAndMediaTypeFromExtension ( // Convert the extension to lowercase. for (index = 0; index < extLength ; index++) { - extension[index] = M4OSA_chrToLower(pExtension[index]); + extension[index] = tolower((int)pExtension[index]); } // Check if the extension is ".mp3". @@ -539,7 +537,7 @@ VideoEdit_chrCompare(M4OSA_Char* pStrIn1, M4OSA_Char* pStrIn2, M4OSA_Int32* pCmpResult) { - M4OSA_chrCompare(pStrIn1, pStrIn2, pCmpResult); + *pCmpResult = strcmp((const char *)pStrIn1, (const char *)pStrIn2); return *pCmpResult; } |