Fix build by removing refs to nonexisting youtube implementation

diff --git a/src/view/common/CMakeLists.txt b/src/view/common/CMakeLists.txt
index 4f22676..c0579c9 100644 (file)
--- a/src/view/common/CMakeLists.txt
+++ b/src/view/common/CMakeLists.txt
@@ -57,7 +57,6 @@ SET(VIEW_COMMON_SOURCES
     ${PROJECT_SOURCE_DIR}/src/view/common/evas_object.cpp
     ${PROJECT_SOURCE_DIR}/src/view/common/scheme.cpp
     ${PROJECT_SOURCE_DIR}/src/view/common/scheme_action_map.cpp
-    ${PROJECT_SOURCE_DIR}/src/view/common/youtubehd.cpp
     ${PROJECT_SOURCE_DIR}/src/view/common/view_logic_apps_support.cpp
     ${PROJECT_SOURCE_DIR}/src/view/common/view_logic_custom_header_support.cpp
     ${PROJECT_SOURCE_DIR}/src/view/common/view_logic_security_support.cpp

diff --git a/src/view/common/application_launcher.cpp b/src/view/common/application_launcher.cpp
index 0212c81..7a91b9a 100644 (file)
--- a/src/view/common/application_launcher.cpp
+++ b/src/view/common/application_launcher.cpp
@@ -24,7 +24,6 @@
 #include <app.h>
 #include <app_manager.h>
 #include <download.h>
-#include <youtubehd.h>
 #include <dpl/singleton_impl.h>
 #include <appsvc.h>
 
@@ -36,7 +35,6 @@ namespace {
 const char * const SERVICE_EXTRA_DATA_KEY_PATH = "path";
 const char * const SERVICE_EXTRA_DATA_KEY_COOKIE = "cookie";
 
-const char * const SCHEME_TYPE_YOUTUBE = "vnd.youtube";
 const char * const SCHEME_TYPE_RTSP = "rtsp";
 const char * const SCHEME_TYPE_HTML5_VIDEO = "html5video";
 }
@@ -156,11 +154,7 @@ void ApplicationLauncher::OnEventReceived(
         }
 
         LogDebug("scheme: " << scheme);
-        if (SCHEME_TYPE_YOUTUBE == scheme) {
-            YouTubeHD *youtube = new YouTubeHD(m_tizenId);
-            url = youtube->getYouTubeHD(uri.c_str());
-            delete youtube;
-        } else if (SCHEME_TYPE_RTSP == scheme ||
+        if (SCHEME_TYPE_RTSP == scheme ||
                    (SCHEME_TYPE_HTML5_VIDEO == scheme))
         {
             url = uri.c_str();

diff --git a/src/view/common/scheme.cpp b/src/view/common/scheme.cpp
index 618875f..6f5cb96 100644 (file)
--- a/src/view/common/scheme.cpp
+++ b/src/view/common/scheme.cpp
@@ -38,7 +38,6 @@ const char * const type2name[Scheme::COUNT] = {
 #ifdef APP_SCHEME_ENABLED
     "app",
 #endif
-    "vnd.youtube",
     "rtsp"
 };
 

diff --git a/src/view/common/scheme.h b/src/view/common/scheme.h
index e55bcd8..2abe09c 100644 (file)
--- a/src/view/common/scheme.h
+++ b/src/view/common/scheme.h
@@ -42,7 +42,6 @@ class Scheme
 #ifdef APP_SCHEME_ENABLED
         APP,
 #endif
-        YOUTUBE,
         RTSP,
 
         COUNT

diff --git a/src/view/common/scheme_action_map_data.h b/src/view/common/scheme_action_map_data.h
index 46415ea..8537f93 100644 (file)
--- a/src/view/common/scheme_action_map_data.h
+++ b/src/view/common/scheme_action_map_data.h
@@ -49,7 +49,7 @@ enum UriAction {
  *           to handle it. The correct behaviour has to be defined. In case of
  *           Tizen, new window will be opened in WRT.
  *
- * Video - YOUTUBE and RSTP are handled by video player.
+ * Video - RSTP is handled by video player.
  *
  * File scheme - FILE scheme has to be handled by WRT with exception to new
  *           window in WAC application (no support for multiple views)
@@ -72,7 +72,6 @@ const UriAction g_tizenActionMap[Scheme::COUNT][SchemeActionMap::COUNT] = {
 #ifdef APP_SCHEME_ENABLED
     { URI_ACTION_WRT, URI_ACTION_WRT, URI_ACTION_WRT },           // APP
 #endif
-    { URI_ACTION_VIDEO, URI_ACTION_VIDEO, URI_ACTION_VIDEO },     // YOUTUBE
     { URI_ACTION_VIDEO, URI_ACTION_VIDEO, URI_ACTION_VIDEO }      // RTSP
 };
 
@@ -91,7 +90,6 @@ const UriAction g_wacActionMap[Scheme::COUNT][SchemeActionMap::COUNT] = {
 #ifdef APP_SCHEME_ENABLED
     { URI_ACTION_WRT, URI_ACTION_WRT, URI_ACTION_APPSVC },        // APP
 #endif
-    { URI_ACTION_VIDEO, URI_ACTION_VIDEO, URI_ACTION_VIDEO },     // YOUTUBE
     { URI_ACTION_VIDEO, URI_ACTION_VIDEO, URI_ACTION_VIDEO }      // RTSP
 };
 }