Changeset 917

Timestamp:

11/11/07 12:08:23 (1 year ago)

Author:

glslang

Message:

+ bug fixes

Location:

trunk

Files:

• installer/jahplayer.nsi (modified) (1 diff)
• jahplayer/bootstrap.py (modified) (2 diffs)
• jahplayer/jah.ico (modified) (previous)
• jahplayer/jahplayer.cpp (modified) (1 diff)
• jahplayer/jahplayer_vc8.vcproj (modified) (2 diffs)
• jahwidgets/src/qt3/python/python_vc8.vcproj (modified) (1 diff)
• jahwidgets/src/qt3/widgets/player.cpp (modified) (2 diffs)

trunk/installer/jahplayer.nsi

@@ -183 +183 @@
   File "C:\Qt\3.3.8\lib\qt-mt338.dll"
   File /r "C:\Program Files\OpenLibraries\bin\*"
+  File "C:\Python25\DLLs\_socket.pyd"
+  
+  SetOutPath $INSTDIR\JahPlayer\plugins
+  File /r "C:\Program Files\OpenLibraries\plugins\release\*"
   
   SetOutPath $INSTDIR\JahPlayer\Lib

trunk/jahplayer/bootstrap.py

@@ -7 +7 @@
 import os.path
 
-# This is required for the executable generated from py2exe
-# to use the preinstalled openlibraries python bindings
-if platform.system() == "Windows" or platform.system() == 'Microsoft':
-        #sys.path.append(os.path.join(os.getcwd(), "..", "openlibraries", "python"))
-        #sys.path.append(os.environ['PYTHONPATH'])
-        pass
-
 # Initialise the dynamic linking functionality - note that the ubuntu amd64
 # distro lacks the dl module, hence fallback to the non-symbolic values
-elif platform.system( ) == "Linux":
+if platform.system( ) == "Linux":
         try:
                 import dl
@@ -26 +19 @@
 import openpluginlib
 
-openpluginlib.init()
+if len( sys.argv ) > 1 and sys.argv[ 1 ] == "-release":
+        openpluginlib.init( os.path.join( os.path.dirname( sys.argv[ 0 ] ), "plugins" ), 0 )
+else:
+        openpluginlib.init( );

trunk/jahplayer/jahplayer.cpp

@@ -14 +14 @@
 
         std::vector<char*> args;
-        args.push_back( "jahplayer" );
+        args.push_back( argv[ 0 ] );
         args.push_back( "jahplayer.py" );
+#ifdef NDEBUG
+        args.push_back( "-release" );
+#endif
+
         Py_Main( args.size( ), &args[ 0 ] );
         

trunk/jahplayer/jahplayer_vc8.vcproj

@@ -191 +191 @@
                         UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
                         >
+                        <File
+                                RelativePath=".\resource1.h"
+                                >
+                        </File>
                 </Filter>
                 <Filter
@@ -197 +201 @@
                         UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
                         >
+                        <File
+                                RelativePath=".\jah.ico"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\jahplayer.rc"
+                                >
+                        </File>
                 </Filter>
         </Files>

trunk/jahwidgets/src/qt3/python/python_vc8.vcproj

@@ -72 +72 @@
                                 LinkIncremental="2"
                                 AdditionalLibraryDirectories="C:\Python25\libs;C:\Boost\lib;$(QTDIR)\lib;$(OPENLIBRARIES_LIB_PATH)"
+                                IgnoreDefaultLibraryNames="msvcrt.lib"
                                 GenerateDebugInformation="true"
                                 ProgramDatabaseFile="$(OutDir)/python.pdb"

trunk/jahwidgets/src/qt3/widgets/player.cpp

@@ -567 +567 @@
 
                         // Determine if the image is supported by the gpu directly
-                        GLint internal_format;
-                        GLenum format, type;
+                        GLint internal_format = 0;
+                        GLenum format, type = GL_UNSIGNED_BYTE;
                         pl::pf_to_gl_format( image->pf( ), internal_format, format, type );
                         ml::image_type_ptr new_im;
@@ -870 +870 @@
 
                 // Determine if the image is supported by the gpu directly
-                GLint internal_format;
-                GLenum format, type;
+                GLint internal_format = 0;
+                GLenum format, type = GL_UNSIGNED_BYTE;
                 pl::pf_to_gl_format( image->pf( ), internal_format, format, type );
                 ml::image_type_ptr new_im;