[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[532] mplayerxp/libvo

[<nic...@us...>]

Revision: 532
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=532&view=rev
Author:   nickols_k
Date:     2012-12-10 13:30:58 +0000 (Mon, 10 Dec 2012)
Log Message:
-----------
compatibility with vidix.svn[353] changeset

Modified Paths:
--------------
    mplayerxp/libvo/vidix_system.cpp
    mplayerxp/libvo/vidix_system.h

Modified: mplayerxp/libvo/vidix_system.cpp
===================================================================
--- mplayerxp/libvo/vidix_system.cpp	2012-12-10 13:18:14 UTC (rev 531)
+++ mplayerxp/libvo/vidix_system.cpp	2012-12-10 13:30:58 UTC (rev 532)
@@ -38,13 +38,15 @@
 int munlock(const any_t*addr,size_t len) { return ENOSYS; }
 #endif
 
-Vidix_System::Vidix_System(const char *drvname)
-	    :vidix(new(zeromem) Vidix(drvname?drvname[0]==':'?&drvname[1]:drvname[0]?drvname:NULL:NULL,
+Vidix_System::Vidix_System(const std::string& drvname)
+	    :vidix(new(zeromem) Vidix(!drvname.empty()?
+					drvname[0]==':'?
+					    drvname.substr(1):drvname:"",
 			TYPE_OUTPUT,
 			mp_conf.verbose))
 {
     int err;
-    MSG_DBG2("vidix_preinit(%s) was called\n",drvname);
+    MSG_DBG2("vidix_preinit(%s) was called\n",drvname.c_str());
     if(vidix->version() != VIDIX_VERSION) {
 	MSG_FATAL("You have wrong version of VIDIX library\n");
 	exit_player("Vidix");

Modified: mplayerxp/libvo/vidix_system.h
===================================================================
--- mplayerxp/libvo/vidix_system.h	2012-12-10 13:18:14 UTC (rev 531)
+++ mplayerxp/libvo/vidix_system.h	2012-12-10 13:30:58 UTC (rev 532)
@@ -26,7 +26,7 @@
 
 struct Vidix_System : public video_private {
     public:
-	Vidix_System(const char *drvname);
+	Vidix_System(const std::string& drvname);
 	virtual ~Vidix_System();
 
 	MPXP_Rc		configure(unsigned src_width,unsigned src_height,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.