From 158946668a75a0dad7b53bc74fd2b6f8f4a4befc Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Mon, 31 Aug 2009 17:16:21 +0000 Subject: svn merge -r130875:131962 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit --- indra/test_apps/llplugintest/CMakeLists.txt | 26 ++-------------- indra/test_apps/llplugintest/bookmarks.txt | 10 ------- indra/test_apps/llplugintest/llmediaplugintest.cpp | 35 ++++------------------ 3 files changed, 8 insertions(+), 63 deletions(-) (limited to 'indra/test_apps') diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt index dd894087e6..789ead04fe 100644 --- a/indra/test_apps/llplugintest/CMakeLists.txt +++ b/indra/test_apps/llplugintest/CMakeLists.txt @@ -283,10 +283,8 @@ target_link_libraries(llmediaplugintest add_dependencies(llmediaplugintest copy_win_libs SLPlugin - media_plugin_flash_activex media_plugin_quicktime media_plugin_webkit - media_plugin_awesomium ${LLPLUGIN_LIBRARIES} ${LLMESSAGE_LIBRARIES} ${LLCOMMON_LIBRARIES} @@ -321,12 +319,6 @@ if (DARWIN OR WINDOWS) DEPENDS ${BUILT_QUICKTIME_PLUGIN} ) - get_target_property(BUILT_AWESOMIUM_PLUGIN media_plugin_awesomium LOCATION) - add_custom_command(TARGET llmediaplugintest POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_AWESOMIUM_PLUGIN} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ - DEPENDS ${BUILT_AWESOMIUM_PLUGIN} - ) - # copy over bookmarks file if llmediaplugintest gets built get_target_property(BUILT_LLMEDIAPLUGINTEST llmediaplugintest LOCATION) add_custom_command(TARGET llmediaplugintest POST_BUILD @@ -340,24 +332,10 @@ if (DARWIN OR WINDOWS) ) endif (DARWIN OR WINDOWS) -if (WINDOWS) - get_target_property(BUILT_FLASH_ACTIVEX_PLUGIN media_plugin_flash_activex LOCATION) - add_custom_command(TARGET llmediaplugintest POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_FLASH_ACTIVEX_PLUGIN} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ - DEPENDS ${BUILT_FLASH_ACTIVEX_PLUGIN} - ) - -endif (WINDOWS) - if (DARWIN) add_custom_command(TARGET llmediaplugintest POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllwebkitlib.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ - DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllwebkitlib.dylib - ) - - add_custom_command(TARGET llmediaplugintest POST_BUILD - COMMAND rsync -av --delete ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/Awesomium.framework ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ - DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/Awesomium.framework + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ + DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ) endif (DARWIN) diff --git a/indra/test_apps/llplugintest/bookmarks.txt b/indra/test_apps/llplugintest/bookmarks.txt index 3de56db532..796cc5d1b2 100644 --- a/indra/test_apps/llplugintest/bookmarks.txt +++ b/indra/test_apps/llplugintest/bookmarks.txt @@ -10,16 +10,6 @@ (WK) DHTML graphics demos,http://www.dhteumeuleu.com/ (WK) Neat Javascript 3D,http://gyu.que.jp/jscloth/ (QT) Local sample,file:///C|/Program Files/QuickTime/Sample.mov -(FLASH) Falling Bush,http://de.fishki.net/video/bush.swf -(FLASH) Bubble Shooter,http://www.wiicade.com/Data/72/game.swf -(FLASH) MAME,http://yvern.com/fMAME/testDecryptLoader.swf -(FLASH) Scribd doc,http://documents.scribd.com/ScribdViewer.swf?document_id=7470987&access_key=key-gemg40ut1qjepsgrx9y&page=&version=1&auto_size=true&viewMode= -(FLASH) GE Whiteboard,http://imagination3.com/pen_main.swf -(FLASH) DabbleBoard,http://www.dabbleboard.com/swf/db.swf -(FLASH) Countdown,http://itv.jaildog.com/sites/itv/ivbg/countdown.swf -(FLASH) Blockbusters,http://itv.jaildog.com/sites/itv/ivbg/blockbusters.swf -(FLASH) Clock Block,http://www.subliminalmessages.com/images/clockblock.swf -(FLASH) Devil Cat YouYube movie,http://www.youtube.com/swf/l.swf?swf=http%3A//s.ytimg.com/yt/swf/cps-vfl99456.swf&video_id=YRyK_1g4VWQ&rel=1&eurl=&iurl=http%3A//i2.ytimg.com/vi/YRyK_1g4VWQ/hqdefault.jpg&sk=70SiFZ9wC2NTIYkBXg_bK8xZB6OHmmfwC&fexp=900503%2C900037&fs=1&hl=en&autoplay=1&cr=US&avg_rating=4.56172839506&length_seconds=22&allow_ratings=1&allow_embed=1&title=devil%20cat (QT) Movie - Watchmen Trailer,http://movies.apple.com/movies/wb/watchmen/watchmen-tlr2_480p.mov (QT) Movie - Transformers - Revenge of the Fallen,http://movies.apple.com/movies/paramount/transformers2/transformersrevengeofthefallen-tlr1_h.320.mov (QT) Movie - Terminator Salvation,http://movies.apple.com/movies/wb/terminatorsalvation/terminatorsalvation-tlr3_h.320.mov diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp index 7a84ef83cb..cd90884d09 100644 --- a/indra/test_apps/llplugintest/llmediaplugintest.cpp +++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp @@ -120,7 +120,7 @@ LLMediaPluginTest::LLMediaPluginTest( int app_window, int window_width, int wind mVersionMajor( 2 ), mVersionMinor( 0 ), mVersionPatch( 0 ), - mMaxPanels( 16 ), + mMaxPanels( 25 ), mViewportAspect( 0 ), mAppWindow( app_window ), mCurMouseX( 0 ), @@ -174,13 +174,6 @@ LLMediaPluginTest::LLMediaPluginTest( int app_window, int window_width, int wind { std::string description = line.substr( 0, comma_pos ); std::string url = line.substr( comma_pos + 1 ); -#if LL_DARWIN || LL_LINUX - // Don't load flash movies on mac or linux yet. - if ( url.find( ".swf" ) != std::string::npos ) - { - continue; - } -#endif mBookmarks.push_back( std::pair< std::string, std::string >( description, url ) ); } else @@ -229,16 +222,14 @@ LLMediaPluginTest::LLMediaPluginTest( int app_window, int window_width, int wind resetView(); // initial media panel - const int num_initial_panels = 4; - for( int i = 0; i < num_initial_panels; ++i ) - { - //addMediaPanel( mBookmarks[ rand() % ( mBookmarks.size() - 1 ) + 1 ].second ); - }; + //const int num_initial_panels = 4; + //for( int i = 0; i < num_initial_panels; ++i ) + //{ + // addMediaPanel( mBookmarks[ rand() % ( mBookmarks.size() - 1 ) + 1 ].second ); + //}; // always add a Web panel for testing addMediaPanel( "http://www.google.com" ); - //addMediaPanel( "http://www.wiicade.com/Data/72/game.swf" ); - //addMediaPanel( "http://movies.apple.com/movies/wb/watchmen/watchmen-tlr2_480p.mov" ); } //////////////////////////////////////////////////////////////////////////////// @@ -1465,9 +1456,6 @@ std::string LLMediaPluginTest::mimeTypeFromUrl( std::string& url ) std::string mime_type = "text/html"; // we may need a more advanced MIME type accessor later :-) - if ( url.find( ".swf" ) != std::string::npos ) // Flash movies - mime_type = "application/x-shockwave-flash"; - else if ( url.find( ".mov" ) != std::string::npos ) // Movies mime_type = "video/quicktime"; else @@ -1497,9 +1485,6 @@ std::string LLMediaPluginTest::pluginNameFromMimeType( std::string& mime_type ) else if ( mime_type == "text/html" ) plugin_name = "media_plugin_webkit.dll"; - else - if ( mime_type == "application/x-shockwave-flash" ) - plugin_name = "media_plugin_flash_activex.dll"; #elif LL_LINUX std::string plugin_name( "libmedia_plugin_null.so" ); @@ -1813,14 +1798,6 @@ void LLMediaPluginTest::getRandomMediaSize( int& width, int& height, std::string // adjust this random size if it's a browser so we get // a more useful size for testing.. if ( mime_type == "text/html" ) - { - width = ( ( rand() % 100 ) + 100 ) * 4; - height = ( width * ( ( rand() % 400 ) + 1000 ) ) / 1000; - } - else - // adjust this random size if it's Flash so we get - // a more useful size for testing.. - if ( mime_type == "application/x-shockwave-flash" ) { width = ( ( rand() % 100 ) + 100 ) * 4; height = ( width * ( ( rand() % 400 ) + 1000 ) ) / 1000; -- cgit v1.2.3