livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with tip

meow-7.2.2
callum 2009-11-16 18:42:35 -08:00
parent 16fa3a40e3
commit 18eab4a026
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/media_plugins/quicktime/media_plugin_quicktime.cpp
View File

@ -552,7 +552,7 @@ private:
processState();
// see if title arrived and if so, update member variable with contents
checkTitle();
//checkTitle();
// QT call to see if we are at the end - can't do with controller
if ( IsMovieDone( mMovieHandle ) )
@ -718,18 +718,24 @@ private:
// find the size of the title
ByteCount size;
result = QTMetaDataGetItemValue( media_data_ref, item, NULL, 0, &size );
if ( noErr != result || size <= 0 )
if ( noErr != result || size <= 0 /*|| size > 1024 /* FIXME: arbitrary limit */ )
return false;
// allocate some space and grab it
UInt8* item_data = new UInt8( size );
memset( item_data, 0, size * sizeof( UInt8* ) );
UInt8* item_data = new UInt8( size + 1 );
memset( item_data, 0, ( size + 1 ) * sizeof( UInt8* ) );
result = QTMetaDataGetItemValue( media_data_ref, item, item_data, size, NULL );
if ( noErr != result )
{
delete [] item_data;
return false;
};
// save it
mMovieTitle = std::string( (char* )item_data );
if ( strlen( (char*)item_data ) )
mMovieTitle = std::string( (char* )item_data );
else
mMovieTitle = "";
// clean up
delete [] item_data;

18
indra/test_apps/llplugintest/llmediaplugintest.cpp
View File

@ -223,13 +223,16 @@ LLMediaPluginTest::LLMediaPluginTest( int app_window, int window_width, int wind
resetView();
// initial media panel
//const int num_initial_panels = 1;
//for( int i = 0; i < num_initial_panels; ++i )
//{
// //addMediaPanel( mBookmarks[ rand() % ( mBookmarks.size() - 1 ) + 1 ].second );
// addMediaPanel( mHomeWebUrl );
//};
addMediaPanel( "http://chemicaljump.com/wp-content/uploads/2009/10/lth34/Proxy-8000.mp3" );
addMediaPanel( "http://movies.apple.com/movies/sony_pictures/zombieland/zombieland-inttlr_h.320.mov" );
const int num_initial_panels = 1;
for( int i = 0; i < num_initial_panels; ++i )
{
//addMediaPanel( mBookmarks[ rand() % ( mBookmarks.size() - 1 ) + 1 ].second );
addMediaPanel( mHomeWebUrl );
};
}
////////////////////////////////////////////////////////////////////////////////
@ -1460,6 +1463,9 @@ std::string LLMediaPluginTest::mimeTypeFromUrl( std::string& url )
if ( url.find( ".txt" ) != std::string::npos ) // Apple Text descriptors
mime_type = "video/quicktime";
else
if ( url.find( ".mp3" ) != std::string::npos ) // Apple Text descriptors
mime_type = "video/quicktime";
else
if ( url.find( "example://" ) != std::string::npos ) // Example plugin
mime_type = "example/example";