Changeset 2fe5a2c748b2c568ac4977bc1a73309fedc68266

Timestamp:

17/02/03 06:50:31 (6 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1045461031 +0000

git-parent:

[b42e431cad7b298e96c9ed4d6e1338fc89297a84]

git-author:

Sam Hocevar <sam@videolan.org> 1045461031 +0000

Message:

• ./src/misc/win32_specific.c: under Win32 we retrieve the executable's
  directory whenever possible, to use it for the spudec font or to load
  plugins.
  

Files:

• include/main.h (modified) (2 diffs)
• modules/codec/spudec/spudec.c (modified) (3 diffs)
• src/misc/modules.c (modified) (4 diffs)
• src/misc/win32_specific.c (modified) (2 diffs)

include/main.h

@@ -4 +4 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
-2 2003/01/19 03:16:24
+3 2003/02/17 05:50:31
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -65 +65 @@
-    vlc_bool_t             b_fast_mutex;
-    int                    i_win9x_cv;
+    char *                 psz_vlcpath;
-#endif
-};

modules/codec/spudec/spudec.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-4 2003/01/30 16:36:04 gbazin
+5 2003/02/17 05:50:31 sam
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -55 +55 @@
-vlc_module_begin();
-    add_category_hint( N_("subtitles"), NULL );
-
+
+
-    add_file( "spudec-font", NULL, NULL,
-              FONT_TEXT, FONT_LONGTEXT );
-#else
-./
+
-              FONT_TEXT, FONT_LONGTEXT );
-#endif
@@ -136 +137 @@
-            sprintf(psz_font, "%s/share/" DEFAULT_FONT, psz_vlcpath);
-        }
+#elif defined(WIN32) && !defined(UNDER_CE)
+        if ( (psz_font = config_GetPsz( p_fifo, "spudec-font" )) == NULL )
+        {
+            char * psz_vlcpath = p_fifo->p_libvlc->psz_vlcpath;
+            psz_font = malloc( strlen(psz_vlcpath) + strlen("\\share\\")
+                                + strlen(DEFAULT_FONT) + 1 );
+            sprintf(psz_font, "%s\\share\\" DEFAULT_FONT, psz_vlcpath);
+        }
-#else
-        if( (psz_font = config_GetPsz( p_fifo, "spudec-font" )) == NULL )

src/misc/modules.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-1 2003/01/27 17:41:01 ipkiss
+2 2003/02/17 05:50:31 sam
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -552 +552 @@
-    char **         ppsz_path = path;
-    char *          psz_fullpath;
-
+
+
-    int             i_vlclen = strlen( p_this->p_libvlc->psz_vlcpath );
-    vlc_bool_t      b_notinroot;
@@ -567 +568 @@
-    for( ; *ppsz_path != NULL ; ppsz_path++ )
-    {
-
+
+
-        /* Store strlen(*ppsz_path) for later use. */
-        int i_dirlen = strlen( *ppsz_path );
@@ -574 +576 @@
-        /* Under BeOS, we need to add beos_GetProgramPath() to access
-         * files under the current directory */
-
+
+
+
+
+
-        {
-            i_dirlen += i_vlclen + 2;

src/misc/win32_specific.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-0 2003/01/19 03:16:24
+1 2003/02/17 05:50:31
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -40 +40 @@
-    WSADATA Data;
-    int i_err;
+
+    /* Get our full path */
+    if( ppsz_argv[0] )
+    {
+        char psz_path[MAX_PATH];
+        char *psz_vlc;
+
+        GetFullPathName( ppsz_argv[0], MAX_PATH, psz_path, &psz_vlc );
+
+        if( psz_vlc > psz_path && psz_vlc[-1] == '\\' )
+        {
+            psz_vlc[-1] = '\0';
+            p_this->p_libvlc->psz_vlcpath = strdup( psz_path );
+        }
+        else
+        {
+            p_this->p_libvlc->psz_vlcpath = strdup( "" );
+        }
+    }
+    else
+    {
+        p_this->p_libvlc->psz_vlcpath = strdup( "" );
+    }
-
-    /* WinSock Library Init. */