[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1736
Date       : Mon Sep  4 14:11:57 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/selmedia.h
   M /Trunk/XaraLX/wxOil/camelot.cpp

Fix the movie replay, too allow it to continue past 51s


Diff:
Index: Trunk/XaraLX/Kernel/selmedia.h
===================================================================
--- Trunk/XaraLX/Kernel/selmedia.h	(revision 1735)
+++ Trunk/XaraLX/Kernel/selmedia.h	(revision 1736)
@@ -131,7 +131,7 @@
 {
 CC_DECLARE_DYNAMIC(SelMediaDlgParam)
 
-	typedef std::map<PCTSTR, bool>	CMediaAppList;
+	typedef std::map<String_256, bool>	CMediaAppList;
 	typedef CMediaAppList::iterator CMediaAppListIter;
 	
 	CMediaAppList*	m_pAppList;
Index: Trunk/XaraLX/wxOil/camelot.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camelot.cpp	(revision 1735)
+++ Trunk/XaraLX/wxOil/camelot.cpp	(revision 1736)
@@ -2839,7 +2839,7 @@
 		SelMediaDlgParam::CMediaAppListIter	iterCur( iter++ ); 
 		if( !Detect.IsAppPresent( iterCur->first ) )
 		{
-			TRACEUSER( "luke", _T("%s is not present"), iterCur->first );
+			TRACEUSER( "luke", _T("%s is not present"), (PCTSTR)iterCur->first );
 			 pMapMediaApp->erase( iterCur->first );
 		}
 	}
@@ -2891,14 +2891,16 @@
 	}
 
 	// Check to see if we can control the selected app. (maybe one day....)
-	SelMediaDlgParam::CMediaAppListIter iter = mapMediaApp.find( m_strMediaApplication );
-	bool				fControlable = false;
+	SelMediaDlgParam::CMediaAppListIter iter = mapMediaApp.find( (PCTSTR)m_strMediaApplication );
+	bool				fMPlayer = false;
 	if( mapMediaApp.end() != iter )
-		fControlable = iter->second;
+		fMPlayer = iter->second;
 
 	// Build the command line and execute it
 	wxString			strCommand;
 	strCommand = PCTSTR(m_strMediaApplication);
+	if( fMPlayer )
+		strCommand.append( _T(" -quiet ") );
 	strCommand.Append( _T(" \"") );
 	strCommand.Append( strUrl );
 	strCommand.Append( _T("\"") );


Xara