Changeset 66d883a95cd1dce8b2e35efe5bee34126dd93e95

Timestamp:

20/07/08 22:57:28 (5 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1216587448 +0200

git-parent:

[fb0a060578bd8c7b2983e2b8ed0dffda8a51c631]

git-author:

Laurent Aimar <fenrir@videolan.org> 1216587448 +0200

Message:

Cosmetics (moved BuildDone? under HAVE_FONTCONFIG)

Files:

• modules/misc/freetype.c (modified) (6 diffs)

modules/misc/freetype.c

@@ -179 +179 @@
-static char *FontConfig_Select( FcConfig *, const char *,
-                                bool, bool, int * );
-static int BuildDone( vlc_object_t*, const char *, vlc_value_t, vlc_value_t,
-                        void* );
-#endif
-
@@ -250 +248 @@
-static void FontBuilderThread( vlc_object_t *p_this);
-static void FontBuilderDestructor( vlc_object_t *p_this );
+static int FontBuilderDone( vlc_object_t*, const char *, vlc_value_t, vlc_value_t,
+                        void* );
-#endif
-
@@ -483 +483 @@
-    if( p_fontbuilder )
-    {
-Build
+FontBuilder
-        var_TriggerCallback( p_fontbuilder, "build-done" );
-    }
@@ -495 +495 @@
-    if( p_fontbuilder )
-    {
-Build
+FontBuilder
-
-        /* We wait for the thread on the first FontBuilderDetach */
@@ -547 +547 @@
-    if( p_fontconfig )
-        FcConfigDestroy( p_fontconfig );
+}
+static int FontBuilderDone( vlc_object_t *p_this, const char *psz_var,
+                       vlc_value_t oldval, vlc_value_t newval, void *param )
+{
+    filter_t *p_filter = param;
+    filter_sys_t *p_sys = p_filter->p_sys;
+
+    if( newval.b_bool )
+    {
+        vlc_mutex_t *p_lock = var_AcquireMutex( "fontbuilder" );
+
+        p_sys->b_fontconfig_ok = true;
+        p_sys->p_fontconfig = p_this->p_private;
+
+        vlc_mutex_unlock( p_lock );
+    }
+
+    VLC_UNUSED(psz_var);
+    VLC_UNUSED(oldval);
+    return VLC_SUCCESS;
-}
-#endif
@@ -2197 +2217 @@
-}
-
-static int BuildDone( vlc_object_t *p_this, const char *psz_var,
-                       vlc_value_t oldval, vlc_value_t newval, void *param )
-{
-    filter_t *p_filter = param;
-    filter_sys_t *p_sys = p_filter->p_sys;
-
-    if( newval.b_bool )
-    {
-        vlc_mutex_t *p_lock = var_AcquireMutex( "fontbuilder" );
-
-        p_sys->b_fontconfig_ok = true;
-        p_sys->p_fontconfig = p_this->p_private;
-
-        vlc_mutex_unlock( p_lock );
-    }
-
-    VLC_UNUSED(psz_var);
-    VLC_UNUSED(oldval);
-    return VLC_SUCCESS;
-}
-
-static int ProcessLines( filter_t *p_filter,
-                         uint32_t *psz_text,