New AppControl Spec

Change-Id: Id4ab77ecbe8bfe7985f4ec2f296a85d378740437
Signed-off-by: HyukSoon Choi <hs619.choi@samsung.com>

diff --git a/inc/VpTypes.h b/inc/VpTypes.h
index 8433620..59059be 100644 (file)
--- a/inc/VpTypes.h
+++ b/inc/VpTypes.h
@@ -66,6 +66,8 @@ extern const wchar_t* APPCONTROL_KEY_PATH;
 extern const wchar_t* APPCONTROL_KEY_ATTACHMENTS;
 extern const wchar_t* APPCONTROL_KEY_LEGACY_RESULT;
 
+extern const wchar_t* APPCONTROL_DATA_URI_FILE;
+
 extern const wchar_t* IDS_COM_HEADER_AUDIO_DEVICE_ABB;
 extern const wchar_t* IDS_COM_OPT_SPEAKER_ABB;
 extern const wchar_t* IDS_COM_OPT_HEADPHONES_ABB;
@@ -87,4 +89,4 @@ extern const wchar_t* IDC_LABEL_FULLTIME;
 extern const wchar_t* IDC_LABEL_VIDEO_TITLE;
 extern const wchar_t* IDC_SLIDER;
 
-#endif // _VP_TYPES_H_
\ No newline at end of file
+#endif // _VP_TYPES_H_

diff --git a/manifest.xml b/manifest.xml
index d2a6e81..f9a6035 100644 (file)
--- a/manifest.xml
+++ b/manifest.xml
@@ -5,7 +5,7 @@
     <Type>C++App</Type>
     <Requirements/>
     <Apps>
-        <ApiVersion>2.0</ApiVersion>
+        <ApiVersion>2.1</ApiVersion>
         <Secret/>
         <Privileges>
             <Privilege>http://tizen.org/privilege/alarm</Privilege>
@@ -25,15 +25,9 @@
             </Icons>
             <AppControls>
                 <AppControl Category="osp.appcontrol.category.none" ProviderId="http://tizen.org/appcontrol/provider/video">
-                    <Capability OperationId="http://tizen.org/appcontrol/operation/play">
-                        <Resolution MimeType="video/*"/>
-                    </Capability>
                     <Capability OperationId="http://tizen.org/appcontrol/operation/view">
                         <Resolution MimeType="video/*"/>
                     </Capability>
-                    <Capability OperationId="http://tizen.org/appcontrol/operation/configure">
-                        <Resolution MimeType="" UriScheme=""/>
-                    </Capability>
                 </AppControl>
             </AppControls>
             <LaunchConditions/>

diff --git a/src/VpTypes.cpp b/src/VpTypes.cpp
index 1558eff..f80e6a8 100644 (file)
--- a/src/VpTypes.cpp
+++ b/src/VpTypes.cpp
@@ -37,6 +37,8 @@ const wchar_t* APPCONTROL_KEY_PATH = L"path";
 const wchar_t* APPCONTROL_KEY_ATTACHMENTS = L"attachments";
 const wchar_t* APPCONTROL_KEY_LEGACY_RESULT = L"http://tizen.org/appcontrol/data/legacyresult";
 
+const wchar_t* APPCONTROL_DATA_URI_FILE = L"file://";
+
 const wchar_t* IDS_COM_HEADER_AUDIO_DEVICE_ABB = L"IDS_COM_HEADER_AUDIO_DEVICE_ABB";
 const wchar_t* IDS_COM_OPT_SPEAKER_ABB = L"IDS_COM_OPT_SPEAKER_ABB";
 const wchar_t* IDS_COM_OPT_HEADPHONES_ABB = L"IDS_COM_OPT_HEADPHONES_ABB";
@@ -56,4 +58,4 @@ const wchar_t* IDC_BUTTON_SCREENMODE = L"IDC_BUTTON_SCREENMODE";
 const wchar_t* IDC_LABEL_CURRENTTIME = L"IDC_LABEL_CURRENTTIME";
 const wchar_t* IDC_LABEL_FULLTIME = L"IDC_LABEL_FULLTIME";
 const wchar_t* IDC_LABEL_VIDEO_TITLE = L"IDC_LABEL_VIDEO_TITLE";
-const wchar_t* IDC_SLIDER = L"IDC_SLIDER";
\ No newline at end of file
+const wchar_t* IDC_SLIDER = L"IDC_SLIDER";

diff --git a/src/VpVideoPlayerApp.cpp b/src/VpVideoPlayerApp.cpp
index 2fa63d9..061b912 100644 (file)
--- a/src/VpVideoPlayerApp.cpp
+++ b/src/VpVideoPlayerApp.cpp
@@ -197,7 +197,11 @@ VideoPlayerApp::OnAppControlRequestReceived(RequestId reqId, const String& opera
        }
        else if (pUriData != null)
        {
+               String original = APPCONTROL_DATA_URI_FILE;
+               String replace = L"";
                __uriData = *pUriData;
+               __uriData.Replace(original, replace);
+               AppLog("__uriData(%ls) pUriData(%ls)", __uriData.GetPointer(), pUriData->GetPointer());
        }
 }
 
@@ -211,4 +215,4 @@ VideoPlayerApp::OnSettingChanged(String& key)
                UiApp* pApp = UiApp::GetInstance();
                pApp->Terminate();
        }
-}
\ No newline at end of file
+}

diff --git a/src/VpVideoPlayerForm.cpp b/src/VpVideoPlayerForm.cpp
index abb1003..989cabe 100644 (file)
--- a/src/VpVideoPlayerForm.cpp
+++ b/src/VpVideoPlayerForm.cpp
@@ -669,7 +669,6 @@ VideoPlayerForm::OnPlayEndOfClip(bool playNextContent, int repeatMode, int media
 
 CATCH:
        delete pPlayBitmap;
-       pPlayBitmap = null;
 }
 
 void