* modules/gui/skins/*: fix for msvc .dsp generation, replaced the BASIC_SKINS macro...

* msvc/vlc.dsw: added basic_skins and renamed mpeg_video into mpeg_video_old.
* modules/codec/mpeg_video/parser.c: fixed segfault when idct/motion modules can't be loaded.

diff --git a/modules/codec/mpeg_video/parser.c b/modules/codec/mpeg_video/parser.c
index 7ad5b9c568aa012aeea44531a1f37d704ef1c2fe..f180d5a7192ac1541b4db7b461718361444fb854 100644 (file)
--- a/modules/codec/mpeg_video/parser.c
+++ b/modules/codec/mpeg_video/parser.c
@@ -2,7 +2,7 @@
  * video_parser.c : video parser thread
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: parser.c,v 1.13 2003/05/15 22:27:37 massiot Exp $
+ * $Id: parser.c,v 1.14 2003/06/11 10:42:33 gbazin Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -139,7 +139,12 @@ static int RunDecoder ( decoder_fifo_t * p_fifo )
      * Initialize thread
      */
     p_vpar->p_fifo->b_error = InitThread( p_vpar );
-     
+    if( p_vpar->p_fifo->b_error )
+    {
+        free( p_vpar );
+        return( -1 );
+    )
+
     /*
      * Main loop - it is not executed if an error occured during
      * initialization
@@ -196,7 +201,6 @@ static int InitThread( vpar_thread_t *p_vpar )
     if( p_vpar->p_motion == NULL )
     {
         msg_Err( p_vpar->p_fifo, "no suitable motion compensation module" );
-        free( p_vpar );
         return( -1 );
     }
 
@@ -212,7 +216,6 @@ static int InitThread( vpar_thread_t *p_vpar )
     {
         msg_Err( p_vpar->p_fifo, "no suitable IDCT module" );
         module_Unneed( p_vpar->p_fifo, p_vpar->p_motion );
-        free( p_vpar );
         return( -1 );
     }
 
@@ -229,7 +232,6 @@ static int InitThread( vpar_thread_t *p_vpar )
     {
         msg_Err( p_vpar->p_fifo, "cannot initialize bitstream" );
         module_Unneed( p_vpar->p_fifo, p_vpar->p_motion );
-        free( p_vpar );
         return( -1 );
     }
 

diff --git a/modules/gui/skins/Modules.am b/modules/gui/skins/Modules.am
index 9fe6b5c8db557f54ac377f1bf05774bf4058fa7a..8a80b0b20142d01ae226156a890cd2629797c99c 100644 (file)
--- a/modules/gui/skins/Modules.am
+++ b/modules/gui/skins/Modules.am
@@ -1,4 +1,4 @@
-COMMON_skins = \
+SOURCES_skins = \
        modules/gui/skins/os_api.h \
        modules/gui/skins/os_bitmap.h \
        modules/gui/skins/os_event.h \
@@ -92,10 +92,8 @@ COMMON_skins = \
        modules/gui/skins/x11/x11_timer.cpp \
        modules/gui/skins/x11/x11_timer.h \
        modules/gui/skins/x11/x11_window.cpp \
-       modules/gui/skins/x11/x11_window.h
-
-SOURCES_skins = \
-       $(COMMON_skins) \
+       modules/gui/skins/x11/x11_window.h \
+       \
        modules/gui/wxwindows/wxwindows.h \
        modules/gui/wxwindows/fileinfo.cpp \
        modules/gui/wxwindows/messages.cpp \
@@ -107,7 +105,100 @@ SOURCES_skins = \
        $(NULL)
 
 SOURCES_basic_skins = \
-       $(COMMON_skins) \
+       modules/gui/skins/os_api.h \
+       modules/gui/skins/os_bitmap.h \
+       modules/gui/skins/os_event.h \
+       modules/gui/skins/os_font.h \
+       modules/gui/skins/os_graphics.h \
+       modules/gui/skins/os_theme.h \
+       modules/gui/skins/os_window.h \
+       \
+       modules/gui/skins/controls/controls.h \
+       modules/gui/skins/controls/button.cpp \
+       modules/gui/skins/controls/button.h \
+       modules/gui/skins/controls/checkbox.cpp \
+       modules/gui/skins/controls/checkbox.h \
+       modules/gui/skins/controls/generic.cpp \
+       modules/gui/skins/controls/generic.h \
+       modules/gui/skins/controls/image.cpp \
+       modules/gui/skins/controls/image.h \
+       modules/gui/skins/controls/playlist.cpp \
+       modules/gui/skins/controls/playlist.h \
+       modules/gui/skins/controls/rectangle.cpp \
+       modules/gui/skins/controls/rectangle.h \
+       modules/gui/skins/controls/slider.cpp \
+       modules/gui/skins/controls/slider.h \
+       modules/gui/skins/controls/text.cpp \
+       modules/gui/skins/controls/text.h \
+       \
+       modules/gui/skins/parser/flex.c \
+       modules/gui/skins/parser/skin.h \
+       modules/gui/skins/parser/skin.c \
+       modules/gui/skins/parser/wrappers.h \
+       modules/gui/skins/parser/wrappers.cpp \
+       \
+       modules/gui/skins/src/anchor.cpp \
+       modules/gui/skins/src/anchor.h \
+       modules/gui/skins/src/banks.cpp \
+       modules/gui/skins/src/banks.h \
+       modules/gui/skins/src/bezier.cpp \
+       modules/gui/skins/src/bezier.h \
+       modules/gui/skins/src/bitmap.cpp \
+       modules/gui/skins/src/bitmap.h \
+       modules/gui/skins/src/dialogs.cpp \
+       modules/gui/skins/src/dialogs.h \
+       modules/gui/skins/src/event.cpp \
+       modules/gui/skins/src/event.h \
+       modules/gui/skins/src/font.cpp \
+       modules/gui/skins/src/font.h \
+       modules/gui/skins/src/graphics.cpp \
+       modules/gui/skins/src/graphics.h \
+       modules/gui/skins/src/skin_main.cpp \
+       modules/gui/skins/src/skin_common.h \
+       modules/gui/skins/src/theme.cpp \
+       modules/gui/skins/src/theme.h \
+       modules/gui/skins/src/themeloader.cpp \
+       modules/gui/skins/src/themeloader.h \
+       modules/gui/skins/src/vlcproc.cpp \
+       modules/gui/skins/src/vlcproc.h \
+       modules/gui/skins/src/window.cpp \
+       modules/gui/skins/src/window.h \
+       \
+       modules/gui/skins/win32/win32_api.cpp \
+       modules/gui/skins/win32/win32_bitmap.cpp \
+       modules/gui/skins/win32/win32_bitmap.h \
+       modules/gui/skins/win32/win32_dragdrop.cpp \
+       modules/gui/skins/win32/win32_dragdrop.h \
+       modules/gui/skins/win32/win32_event.cpp \
+       modules/gui/skins/win32/win32_event.h \
+       modules/gui/skins/win32/win32_font.cpp \
+       modules/gui/skins/win32/win32_font.h \
+       modules/gui/skins/win32/win32_graphics.cpp \
+       modules/gui/skins/win32/win32_graphics.h \
+       modules/gui/skins/win32/win32_run.cpp \
+       modules/gui/skins/win32/win32_theme.cpp \
+       modules/gui/skins/win32/win32_theme.h \
+       modules/gui/skins/win32/win32_window.cpp \
+       modules/gui/skins/win32/win32_window.h \
+       \
+       modules/gui/skins/x11/x11_api.cpp \
+       modules/gui/skins/x11/x11_bitmap.cpp \
+       modules/gui/skins/x11/x11_bitmap.h \
+       modules/gui/skins/x11/x11_dragdrop.cpp \
+       modules/gui/skins/x11/x11_dragdrop.h \
+       modules/gui/skins/x11/x11_event.cpp \
+       modules/gui/skins/x11/x11_event.h \
+       modules/gui/skins/x11/x11_font.cpp \
+       modules/gui/skins/x11/x11_font.h \
+       modules/gui/skins/x11/x11_graphics.cpp \
+       modules/gui/skins/x11/x11_graphics.h \
+       modules/gui/skins/x11/x11_run.cpp \
+       modules/gui/skins/x11/x11_theme.cpp \
+       modules/gui/skins/x11/x11_theme.h \
+       modules/gui/skins/x11/x11_timer.cpp \
+       modules/gui/skins/x11/x11_timer.h \
+       modules/gui/skins/x11/x11_window.cpp \
+       modules/gui/skins/x11/x11_window.h \
        $(NULL)
 
 EXTRA_DIST += \

diff --git a/modules/gui/skins/gtk2/gtk2_run.cpp b/modules/gui/skins/gtk2/gtk2_run.cpp
index e55d0cfbcf8740ee762138150ebc9c7b1dbfd02e..47274219be894b347c3e3bfa9e2ce49b967db2dd 100644 (file)
--- a/modules/gui/skins/gtk2/gtk2_run.cpp
+++ b/modules/gui/skins/gtk2/gtk2_run.cpp
@@ -2,7 +2,7 @@
  * gtk2_run.cpp:
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: gtk2_run.cpp,v 1.25 2003/06/03 22:18:58 gbazin Exp $
+ * $Id: gtk2_run.cpp,v 1.26 2003/06/11 10:42:33 gbazin Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -164,7 +164,7 @@ void GTK2Proc( GdkEvent *event, gpointer data )
     // Check if vlc is closing
     proc->IsClosing();
 
-#ifndef BASIC_SKINS
+#if !defined(MODULE_NAME_IS_basic_skins)
     gtk_main_do_event( event );
 #endif
 
@@ -194,7 +194,7 @@ void OSRun( intf_thread_t *p_intf )
     CallBackObjects *callbackobj = new CallBackObjects();
     callbackobj->Proc = new VlcProc( p_intf );
 
-#ifndef BASIC_SKINS
+#if !defined(MODULE_NAME_IS_basic_skins)
     wxTheApp = new Instance( p_intf, callbackobj );
     wxEntry( 1, p_args );
 #else

diff --git a/modules/gui/skins/parser/flex.c b/modules/gui/skins/parser/flex.c
index 7c173ac513029560d5eea250e551f7fc8bae3634..dfdf3089a6dfd65ec494cefa924be8162facf404 100644 (file)
--- a/modules/gui/skins/parser/flex.c
+++ b/modules/gui/skins/parser/flex.c
@@ -1,7 +1,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /root/vlc-cvs/modules/gui/skins/parser/flex.c,v 1.7 2003/05/01 13:51:03 ipkiss Exp $
+ * $Header: /root/vlc-cvs/modules/gui/skins/parser/flex.c,v 1.8 2003/06/11 10:42:33 gbazin Exp $
  */
 
 #define FLEX_SCANNER
@@ -3077,7 +3077,9 @@ const char rcs_skin_dtd[] =
  "$" "Id: skin.dtd,v 1.4 2003/04/20 20:28:39 ipkiss Exp $";
 
 /* ANSI headers. */
+#ifndef _WIN32
 #include <unistd.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
@@ -3833,7 +3835,7 @@ FAIL("EOF in prolog.");
   *  * skin.dtd: DTD for the VLC skins
   *  *****************************************************************************
   *  * Copyright (C) 2003 VideoLAN
-  *  * $Id: flex.c,v 1.7 2003/05/01 13:51:03 ipkiss Exp $
+  *  * $Id: flex.c,v 1.8 2003/06/11 10:42:33 gbazin Exp $
   *  *
   *  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
   *  *          Emmanuel Puig    <karibu@via.ecp.fr>

diff --git a/modules/gui/skins/parser/skin.act b/modules/gui/skins/parser/skin.act
index 4a98804cec4c7960af274674adf962a2cddb9a1f..f7c14368f4e7a1089073f8b769b11f3d512e55ed 100644 (file)
--- a/modules/gui/skins/parser/skin.act
+++ b/modules/gui/skins/parser/skin.act
@@ -4,7 +4,7 @@
  * skin.act: FleXML actions file
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: skin.act,v 1.5 2003/05/01 13:51:03 ipkiss Exp $
+ * $Id: skin.act,v 1.6 2003/06/11 10:42:34 gbazin Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -30,7 +30,7 @@
 <actions>
     <top>
         <![CDATA[
-            #include "parser/wrappers.h"
+            #include "../parser/wrappers.h"
         ]]>
     </top>
     <start tag="Bitmap">

diff --git a/modules/gui/skins/parser/skin.c b/modules/gui/skins/parser/skin.c
index 35a6f6f4ded746c228fe1f5e39ff993e5d229816..0601bb4af2f59db927deca7b0a47f46f94857b75 100644 (file)
--- a/modules/gui/skins/parser/skin.c
+++ b/modules/gui/skins/parser/skin.c
@@ -28,7 +28,7 @@
 #line 31 "skin.act"
 
         
-            #include "parser/wrappers.h"
+            #include "../parser/wrappers.h"
         
     
 void STag_Bitmap(void)

diff --git a/modules/gui/skins/src/dialogs.cpp b/modules/gui/skins/src/dialogs.cpp
index 2dbda8244b1651374b669465ad18d64ca033e35b..f302a8c5808162a0dc3de8b3ad3ae49387ba72a5 100644 (file)
--- a/modules/gui/skins/src/dialogs.cpp
+++ b/modules/gui/skins/src/dialogs.cpp
@@ -2,7 +2,7 @@
  * dialogs.cpp: Handles all the different dialog boxes we provide.\r
  *****************************************************************************\r
  * Copyright (C) 2003 VideoLAN\r
- * $Id: dialogs.cpp,v 1.6 2003/06/10 11:43:40 gbazin Exp $\r
+ * $Id: dialogs.cpp,v 1.7 2003/06/11 10:42:34 gbazin Exp $\r
  *\r
  * Authors: Gildas Bazin <gbazin@netcourrier.com>\r
  *\r
@@ -42,7 +42,7 @@
 int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,\r
                  vlc_value_t old_val, vlc_value_t new_val, void *param );\r
 \r
-#ifdef BASIC_SKINS\r
+#if defined(MODULE_NAME_IS_basic_skins)\r
 \r
 // Constructor\r
 Dialogs::Dialogs( intf_thread_t *_p_intf ){}\r
@@ -56,7 +56,7 @@ void Dialogs::ShowPrefs(){}
 void Dialogs::ShowFileInfo(){}\r
 void Dialogs::ShowPopup(){}\r
 \r
-#else // BASIC_SKINS\r
+#else // !MODULE_NAME_IS_basic_skins\r
 \r
 #include "../../wxwindows/wxwindows.h"\r
 #include "share/vlc32x32.xpm"       // include the graphic icon\r
@@ -413,7 +413,7 @@ void Dialogs::OnExitThread( wxCommandEvent& event )
 {\r
     wxTheApp->ExitMainLoop();\r
 }\r
-#endif // BASIC_SKINS\r
+#endif // MODULE_NAME_IS_basic_skins\r
 \r
 /*****************************************************************************\r
  * PopupMenuCB: callback triggered by the intf-popupmenu playlist variable.\r
@@ -423,11 +423,11 @@ void Dialogs::OnExitThread( wxCommandEvent& event )
 int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,\r
                  vlc_value_t old_val, vlc_value_t new_val, void *param )\r
 {\r
-#ifndef BASIC_SKINS\r
+#if !defined(MODULE_NAME_IS_basic_skins)\r
     Dialogs *p_dialogs = (Dialogs *)param;\r
 \r
     p_dialogs->ShowPopup();\r
-#endif // BASIC_SKINS\r
+#endif\r
 \r
     return VLC_SUCCESS;\r
 }\r

diff --git a/modules/gui/skins/src/dialogs.h b/modules/gui/skins/src/dialogs.h
index fd639042bee134de98ee8063da85b7febb6f469b..6b0957539cf92602def5c942d9fa7bde85ede27b 100644 (file)
--- a/modules/gui/skins/src/dialogs.h
+++ b/modules/gui/skins/src/dialogs.h
@@ -2,7 +2,7 @@
  * dialogs.h: Dialogs class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: dialogs.h,v 1.5 2003/06/10 11:43:40 gbazin Exp $
+ * $Id: dialogs.h,v 1.6 2003/06/11 10:42:34 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -32,7 +32,7 @@ using namespace std;
 //---------------------------------------------------------------------------
 struct intf_thread_t;
 
-#ifndef BASIC_SKINS
+#if !defined(MODULE_NAME_IS_basic_skins)
 
 #ifdef WIN32                                               /* mingw32 hack */
 #   undef Yield
@@ -80,7 +80,7 @@ class Dialogs
 
         vlc_bool_t b_popup_change;
 
-#ifndef BASIC_SKINS
+#if !defined(MODULE_NAME_IS_basic_skins)
         // Dialogs
         OpenDialog  *OpenDlg;
         Messages    *MessagesDlg;

diff --git a/modules/gui/skins/src/skin_common.h b/modules/gui/skins/src/skin_common.h
index 65582b35e7cc460624a08211adb11ded534d63ab..09b94669e98010a2819def6d6b907a07951dec44 100644 (file)
--- a/modules/gui/skins/src/skin_common.h
+++ b/modules/gui/skins/src/skin_common.h
@@ -2,7 +2,7 @@
  * skin_common.h: Private Skin interface description
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: skin_common.h,v 1.19 2003/06/10 11:43:40 gbazin Exp $
+ * $Id: skin_common.h,v 1.20 2003/06/11 10:42:34 gbazin Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -77,11 +77,9 @@ struct intf_sys_t
 
     // Popup menu
     vlc_bool_t b_popup_change;
-#ifndef BASIC_SKINS
+#if !defined(MODULE_NAME_IS_basic_skins)
     wxMenu     *p_popup_menu;
-#endif
 
-#ifndef BASIC_SKINS
     wxIcon      *p_icon;
 #endif
 

diff --git a/modules/gui/skins/src/skin_main.cpp b/modules/gui/skins/src/skin_main.cpp
index d0352d58f3fd3730aea72c440dff09baff2cdb44..db37831a60f98657fd82131eaf0a63facd88e9c2 100644 (file)
--- a/modules/gui/skins/src/skin_main.cpp
+++ b/modules/gui/skins/src/skin_main.cpp
@@ -2,7 +2,7 @@
  * skin-main.cpp: skins plugin for VLC
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: skin_main.cpp,v 1.36 2003/06/09 21:14:17 asmax Exp $
+ * $Id: skin_main.cpp,v 1.37 2003/06/11 10:42:34 gbazin Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -29,7 +29,7 @@
 #include <vlc/aout.h>
 
 //--- GENERAL ---------------------------------------------------------------
-#ifndef BASIC_SKINS
+#if !defined(MODULE_NAME_IS_basic_skins)
 #ifdef WIN32                                               /* mingw32 hack */
 #   undef Yield
 #   undef CreateDialog
@@ -51,7 +51,7 @@
 #include "skin_common.h"
 #include "dialogs.h"
 
-#ifndef BASIC_SKINS
+#if !defined(MODULE_NAME_IS_basic_skins)
 #include "../../wxwindows/wxwindows.h"
 #endif
 
@@ -218,7 +218,7 @@ static void Run( intf_thread_t *p_intf )
 
     int a = OSAPI_GetTime();
 
-#ifndef BASIC_SKINS
+#if !defined(MODULE_NAME_IS_basic_skins)
     // Initialize the dialog boxes
     p_intf->p_sys->p_dialogs = new Dialogs( p_intf );
     if( !p_intf->p_sys->p_dialogs ||
@@ -255,7 +255,7 @@ static void Run( intf_thread_t *p_intf )
         if( !Loader->Load( user_skin ) && !Loader->Load( default_skin ) )
         {
 #endif
-#ifndef BASIC_SKINS
+#if !defined(MODULE_NAME_IS_basic_skins)
             wxMutexGuiEnter();
             wxFileDialog dialog( NULL,
                 wxU(_("Open a skin file")), wxT(""), wxT(""),
@@ -278,7 +278,7 @@ static void Run( intf_thread_t *p_intf )
 #endif
             {
                 delete Loader;
-#ifndef BASIC_SKINS
+#if !defined(MODULE_NAME_IS_basic_skins)
                 wxMutexGuiLeave();
 #endif
                 return;
@@ -299,7 +299,7 @@ static void Run( intf_thread_t *p_intf )
 
     OSRun( p_intf );
 
-#ifndef BASIC_SKINS
+#if !defined(MODULE_NAME_IS_basic_skins)
     // clean up the dialog boxes
     delete p_intf->p_sys->p_dialogs;
 #endif
@@ -353,7 +353,7 @@ int SkinManage( intf_thread_t *p_intf )
 
     OSAPI_PostMessage( NULL, VLC_INTF_REFRESH, 0, (long)false );
 
-#ifndef BASIC_SKINS //FIXME
+#if !defined(MODULE_NAME_IS_basic_skins) //FIXME
     // Update the log window
     p_intf->p_sys->p_dialogs->MessagesDlg->UpdateLog();
 

diff --git a/modules/gui/skins/src/vlcproc.cpp b/modules/gui/skins/src/vlcproc.cpp
index 6ea746ab8dd471599e98a9c9209025696aea6a53..c81d26bc17b23b1b65c8d173844c663bb384b612 100644 (file)
--- a/modules/gui/skins/src/vlcproc.cpp
+++ b/modules/gui/skins/src/vlcproc.cpp
@@ -2,7 +2,7 @@
  * vlcproc.cpp: VlcProc class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: vlcproc.cpp,v 1.34 2003/06/10 11:43:40 gbazin Exp $
+ * $Id: vlcproc.cpp,v 1.35 2003/06/11 10:42:34 gbazin Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -29,16 +29,6 @@
 #include <vlc/aout.h>
 #include <vlc/vout.h>
 
-#ifndef BASIC_SKINS
-#ifdef WIN32                                               /* mingw32 hack */
-#   undef Yield
-#   undef CreateDialog
-#endif
-/* Let vlc take care of the i18n stuff */
-#define WXINTL_NO_GETTEXT_MACRO
-#include <wx/wx.h>
-#endif
-
 //--- SKIN ------------------------------------------------------------------
 #include "../os_api.h"
 #include "event.h"

diff --git a/msvc/vlc.dsw b/msvc/vlc.dsw
index 889c04137009ee6187cf691d841b3524acab8f69..2760ef446cd3ce6e6debfa0d18ff9f7bd51a7b5d 100644 (file)
--- a/msvc/vlc.dsw
+++ b/msvc/vlc.dsw
@@ -450,7 +450,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "plugin_mpeg_video"=.\plugin_mpeg_video.dsp - Package Owner=<4>\r
+Project: "plugin_mpeg_video_old"=.\plugin_mpeg_video_old.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -690,6 +690,18 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
+Project: "plugin_basic_skins"=.\plugin_basic_skins.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
 Global:\r
 \r
 Package=<5>\r