[matroska] r723 - in trunk/MatroskaPack: . Full Include Include/functions Include/sections Lite MPEG4 ReadMe Uninstaller bin images

[email protected]
Newsgroups gmane.comp.multimedia.matroska.cvs
Message-ID <[email protected]>
Author: robux4
Date: 2004-08-22 02:02:46 +0400 (Sun, 22 Aug 2004)
New Revision: 723

Added:
   trunk/MatroskaPack/Include/Reserve Files.nsh
   trunk/MatroskaPack/Include/functions/
   trunk/MatroskaPack/Include/functions/CheckVersion.nsh
   trunk/MatroskaPack/Include/functions/ReadMe.nsh
   trunk/MatroskaPack/Include/functions/Strings.nsh
   trunk/MatroskaPack/Include/functions/WindowsVersion.nsh
   trunk/MatroskaPack/Include/sections/
   trunk/MatroskaPack/Include/sections/- Begin.nsh
   trunk/MatroskaPack/Include/sections/- End.nsh
   trunk/MatroskaPack/Include/sections/AC3FILTER.nsh
   trunk/MatroskaPack/Include/sections/COREAAC.nsh
   trunk/MatroskaPack/Include/sections/COREFLACDECODER.nsh
   trunk/MatroskaPack/Include/sections/COREVORBIS.nsh
   trunk/MatroskaPack/Include/sections/FFDSHOW.nsh
   trunk/MatroskaPack/Include/sections/FFDSHOW_.nsh
   trunk/MatroskaPack/Include/sections/MATRIXMIXER.nsh
   trunk/MatroskaPack/Include/sections/MATROSKAMUXER.nsh
   trunk/MatroskaPack/Include/sections/MATROSKAPROP.nsh
   trunk/MatroskaPack/Include/sections/MATROSKASPLITTER.nsh
   trunk/MatroskaPack/Include/sections/MMSWITCH.nsh
   trunk/MatroskaPack/Include/sections/REALMEDIASPLITTER.nsh
   trunk/MatroskaPack/Include/sections/TTA.nsh
   trunk/MatroskaPack/Include/sections/VSFILTER.nsh
   trunk/MatroskaPack/MMSwitch question.txt
   trunk/MatroskaPack/Real-disclaimer.txt
   trunk/MatroskaPack/Uninstaller/Matroska_Pack_Uninstaller_2004-08-21.exe
   trunk/MatroskaPack/Uninstaller/uninstall_2004-08-21.exe
   trunk/MatroskaPack/UserGuide.html
   trunk/MatroskaPack/UserGuide.rtf
   trunk/MatroskaPack/images/
   trunk/MatroskaPack/images/logo_72x57.bmp
   trunk/MatroskaPack/images/matroska.ico
   trunk/MatroskaPack/images/modern_headerbmp.exe
   trunk/MatroskaPack/images/modern_headerbmpr.exe
Removed:
   trunk/MatroskaPack/CoreAAC_safe.nsi
   trunk/MatroskaPack/Disclaimer.html
   trunk/MatroskaPack/Disclaimer.rtf
   trunk/MatroskaPack/Disclaimer_not_needed.sxw
   trunk/MatroskaPack/Disclaimer_old.html
   trunk/MatroskaPack/Full/ReadMe_original.html
   trunk/MatroskaPack/Include/File Association part 1.nsi.txt
   trunk/MatroskaPack/Include/File Association part 2.nsi.txt
   trunk/MatroskaPack/Include/File Association.nsh
   trunk/MatroskaPack/Include/Init InstallDir.nsh
   trunk/MatroskaPack/Include/ReadMe Macros.nsh
   trunk/MatroskaPack/Include/Section - Begin.nsh
   trunk/MatroskaPack/Include/Section - End.nsh
   trunk/MatroskaPack/Include/Section AC3FILTER.nsh
   trunk/MatroskaPack/Include/Section COREAAC.nsh
   trunk/MatroskaPack/Include/Section COREFLACDECODER.nsh
   trunk/MatroskaPack/Include/Section COREVORBIS.nsh
   trunk/MatroskaPack/Include/Section FFDSHOW.nsh
   trunk/MatroskaPack/Include/Section MATRIXMIXER.nsh
   trunk/MatroskaPack/Include/Section MATROSKAMUXER.nsh
   trunk/MatroskaPack/Include/Section MATROSKAPROP.nsh
   trunk/MatroskaPack/Include/Section MATROSKASPLITTER.nsh
   trunk/MatroskaPack/Include/Section MMSWITCH.nsh
   trunk/MatroskaPack/Include/Section REALMEDIASPLITTER.nsh
   trunk/MatroskaPack/Include/Section VSFILTER.nsh
   trunk/MatroskaPack/Include/WindowsVersion Functions.nsh
   trunk/MatroskaPack/Include/ioSpecial.ini
   trunk/MatroskaPack/Lite/ReadMe_original.html
   trunk/MatroskaPack/MPEG4/ReadMe_original.html
   trunk/MatroskaPack/bin/Disclaimer.html
   trunk/MatroskaPack/bin/Matroska_Pack_Full_v1.0.2_ReadMe.html
   trunk/MatroskaPack/bin/Matroska_Pack_Lite_v1.0.2_ReadMe.html
   trunk/MatroskaPack/bin/Matroska_Pack_MPEG4_v1.0.2_ReadMe.html
   trunk/MatroskaPack/bin/Matroska_Pack_content.html
   trunk/MatroskaPack/bin/index.html
Modified:
   trunk/MatroskaPack/Full/Matroska Pack Full.nsi
   trunk/MatroskaPack/Full/ReadMe Matroska Pack Full.nsi
   trunk/MatroskaPack/Full/ReadMe.html
   trunk/MatroskaPack/Include/Component Defines.nsh
   trunk/MatroskaPack/Include/Description Inserts.nsh
   trunk/MatroskaPack/Include/Description Language Strings.nsh
   trunk/MatroskaPack/Include/Design Options.nsh
   trunk/MatroskaPack/Include/Interface Settings.nsh
   trunk/MatroskaPack/Include/Page Defines.nsh
   trunk/MatroskaPack/Lite/Matroska Pack Lite.nsi
   trunk/MatroskaPack/Lite/ReadMe Matroska Pack Lite.nsi
   trunk/MatroskaPack/Lite/ReadMe.html
   trunk/MatroskaPack/MPEG4/Matroska Pack MPEG4.nsi
   trunk/MatroskaPack/MPEG4/ReadMe Matroska Pack MPEG4.nsi
   trunk/MatroskaPack/MPEG4/ReadMe.html
   trunk/MatroskaPack/ReadMe/4_body_end.txt
   trunk/MatroskaPack/Uninstaller/Matroska Pack Uninstaller.nsi
Log:
Update to 1.0.3

Deleted: trunk/MatroskaPack/CoreAAC_safe.nsi

Deleted: trunk/MatroskaPack/Disclaimer.html

Deleted: trunk/MatroskaPack/Disclaimer.rtf

Deleted: trunk/MatroskaPack/Disclaimer_not_needed.sxw

Deleted: trunk/MatroskaPack/Disclaimer_old.html

Modified: trunk/MatroskaPack/Full/Matroska Pack Full.nsi
===================================================================
--- trunk/MatroskaPack/Full/Matroska Pack Full.nsi	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Full/Matroska Pack Full.nsi	2004-08-21 22:02:46 UTC (rev 723)
@@ -1,140 +1,293 @@
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 ; Name:   Matroska Pack Full
 ; File:   Matroska Pack Full.nsi
-; Date:   2004/03/27
-; Autor:  Nibor
+; Date:   2004/08/21
+; Autor:  nibor
 ; NSIS:   NSIS 2.0
 ; Desc:   Full pack with all components
 ;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Include Modern UI
+;first commands
 
-  !include "MUI.nsh"
+    !include "MUI.nsh"
+    SetCompressor lzma
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;General Defines
+;general defines
 
-   !define VERSION "1.0.2"
-   !define VERSIONDATE "2004-03-27"
-   !define NAME "Matroska Pack"
-   !define PACK "Full"
-   !define FILE "Matroska_Pack_${PACK}_v${VERSION}"
+    !define VERSION "1.0.3"
+    !define VERSIONDATE "2004-08-21"
+    !define NAME "Matroska Pack"
+    !define PACK "Full"
+    !define PACKFULL
+    !define FILE "Matroska_Pack_${PACK}_v${VERSION}"
 
-   !define MAINDIR ".."
-   !define COMPONENTSDIR "${MAINDIR}\Components"
-   !define INCLUDEDIR "${MAINDIR}\Include"
+    !define MAINDIR ".."
+    !define COMPONENTSDIR "${MAINDIR}\components"
+    !define INCLUDEDIR "${MAINDIR}\include"
+    !define FUNCTIONSDIR "${INCLUDEDIR}\functions"
+    !define SECTIONSDIR "${INCLUDEDIR}\sections"
 
-   !include "${INCLUDEDIR}\Component Defines.nsh"
-   
-   Var WINDOWSVERSION
-   Var STARTMENU_FOLDER
-   !define MMSWITCH_CUSTOM
-   Var MMSWITCH_UNINSTALL
-   
+    Var WINDOWSVERSION
+    Var STARTMENU_FOLDER
+    !define MMSWITCH_CUSTOM
+    Var MMSWITCH_UNINSTALL
+    Var REALMEDIASPLITTER_INSTALLED
+    Var REALNEEDED
 
+
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Configuration
+;general includes
 
-   SetCompressor lzma
+    !include "${INCLUDEDIR}\Component Defines.nsh"
+    !include "${FUNCTIONSDIR}\WindowsVersion.nsh"
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;configuration
    
-   Name "${NAME} ${PACK} v${VERSION}"
-   Outfile "${MAINDIR}\bin\${FILE}.exe"
+    Name "${NAME} ${PACK} v${VERSION}"
+    Outfile "${MAINDIR}\bin\${FILE}.exe"
    
-   InstallDir "$PROGRAMFILES\${NAME}"
-   InstallDirRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}" "InstallLocation"
+    InstallDir "$PROGRAMFILES\${NAME}"
+    InstallDirRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}" "InstallLocation"
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Interface Settings
+;interface settings
 
-   !include "${INCLUDEDIR}\Interface Settings.nsh"
+    !include "${INCLUDEDIR}\Interface Settings.nsh"
    
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Pages
+;pages
 
-   !include "${INCLUDEDIR}\Page Defines.nsh"
+    !include "${INCLUDEDIR}\Page Defines.nsh"
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Languages
+;languages
 
-   !insertmacro MUI_LANGUAGE "English"
+    !insertmacro MUI_LANGUAGE "English"
 
-   ;Descriptions
-   !include "${INCLUDEDIR}\Description Language Strings.nsh"
+    # descriptions
+    !include "${INCLUDEDIR}\Description Language Strings.nsh"
 
    
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Design Options
+;design options
 
-   ;Version Information requires MUI_LANGUAGE or LoadLanguageFile
-   !include "${INCLUDEDIR}\Version Information.nsh"
-   !include "${INCLUDEDIR}\Design Options.nsh"
+    # Version Information requires MUI_LANGUAGE or LoadLanguageFile
+    !include "${INCLUDEDIR}\Version Information.nsh"
+    !include "${INCLUDEDIR}\Design Options.nsh"
    
    
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Reserve Files
+;reserve files
 
-   ReserveFile "${MAINDIR}\Disclaimer.rtf"
-   ReserveFile "${MAINDIR}\GNU General Public License.txt"
-;   ReserveFile "Matroska.bmp"
+    !include "${INCLUDEDIR}\Reserve Files.nsh"
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Installer Sections
+;installer sections
 
-; Set the install types
+# set the install types
 !include "${INCLUDEDIR}\InstType Defines.nsh"
 
-!include "${INCLUDEDIR}\Section - Begin.nsh"
+!include "${SECTIONSDIR}\- Begin.nsh"
 
-!include "${INCLUDEDIR}\Section MATROSKASPLITTER.nsh"
-!include "${INCLUDEDIR}\Section MATROSKAMUXER.nsh"
+!include "${SECTIONSDIR}\MATROSKASPLITTER.nsh"
+!include "${SECTIONSDIR}\MATROSKAMUXER.nsh"
 
-!include "${INCLUDEDIR}\Section MATROSKAPROP.nsh"
+!include "${SECTIONSDIR}\REALMEDIASPLITTER.nsh"
 
-!include "${INCLUDEDIR}\Section VSFILTER.nsh"
+!include "${SECTIONSDIR}\MATROSKAPROP.nsh"
 
-!include "${INCLUDEDIR}\Section MMSWITCH.nsh"
+!include "${SECTIONSDIR}\VSFILTER.nsh"
 
+!include "${SECTIONSDIR}\MMSWITCH.nsh"
+
 SubSection "Audio Filters" AUDIOFILTERS
-   !include "${INCLUDEDIR}\Section COREAAC.nsh"
-   !include "${INCLUDEDIR}\Section COREVORBIS.nsh"
-   !include "${INCLUDEDIR}\Section COREFLACDECODER.nsh"
-   !include "${INCLUDEDIR}\Section AC3FILTER.nsh"
-   !include "${INCLUDEDIR}\Section MATRIXMIXER.nsh"
+    !include "${SECTIONSDIR}\COREAAC.nsh"
+    !include "${SECTIONSDIR}\COREVORBIS.nsh"
+    !include "${SECTIONSDIR}\COREFLACDECODER.nsh"
+    !include "${SECTIONSDIR}\TTA.nsh"
+    !include "${SECTIONSDIR}\AC3FILTER.nsh"
+    !include "${SECTIONSDIR}\MATRIXMIXER.nsh"
 SubSectionEnd
    
-!include "${INCLUDEDIR}\Section FFDSHOW.nsh"
-   
-!include "${INCLUDEDIR}\Section REALMEDIASPLITTER.nsh"
-   
-!include "${INCLUDEDIR}\Section - End.nsh"
+!include "${SECTIONSDIR}\FFDSHOW.nsh"
 
+!include "${SECTIONSDIR}\- End.nsh"
 
+
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Descriptions
+;descriptions
 
-   !include "${INCLUDEDIR}\Description Inserts.nsh"
+    !include "${INCLUDEDIR}\Description Inserts.nsh"
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Functions
-
-!include "${INCLUDEDIR}\WindowsVersion Functions.nsh"
+;functions
    
 Function .onSelChange
 
-   Call CheckFFDSHOW
+    Call CheckFFDSHOW
 
 FunctionEnd
 
 Function .onInit
 
-   Call GetWindowsNormalOrUnicode
+    Call GetWindowsNormalOrUnicode
 
 FunctionEnd
+
+!macro MIOW_BEGIN IOFILE FIELD
+    # MIOW = Mui_InstallOptions_Write
+    StrCpy $R8 "${IOFILE}"
+    StrCpy $R9 "${FIELD}"
+!macroend
+
+!macro MIOW NAME VALUE
+    !insertmacro MUI_INSTALLOPTIONS_WRITE "$R8" "$R9" "${NAME}" "${VALUE}"
+!macroend
+
+!macro MIOW_END
+    StrCpy $R8 ""
+    StrCpy $R9 ""
+!macroend
+
+Function PageFinishPre
+
+    StrCmp $REALMEDIASPLITTER_INSTALLED "" lblEnd
+    
+    ReadRegStr $R0 HKLM "SOFTWARE\RealNetworks\RealPlayer" version
+    # MessageBox MB_OK $R0
+    StrCmp $R0 "" 0 lblEnd
+
+    StrCpy $REALNEEDED "true"
+
+    !insertmacro MIOW_BEGIN "ioSpecial.ini" "Settings"
+        !insertmacro MIOW "NumFields" "8"
+    !insertmacro MIOW_END
+
+    !insertmacro MIOW_BEGIN "ioSpecial.ini" "Field 3"
+        !insertmacro MIOW "Type" "label"
+        !insertmacro MIOW "Text" "Optional download:"
+        !insertmacro MIOW "Left" "120"
+        !insertmacro MIOW "Right" "315"
+        !insertmacro MIOW "Top" "60"
+        !insertmacro MIOW "Bottom" "70"
+    !insertmacro MIOW_END
+
+    !insertmacro MIOW_BEGIN "ioSpecial.ini" "Field 4"
+        !insertmacro MIOW "Type" "label"
+        !insertmacro MIOW "Text" \
+        "We have received many support requests from users trying \
+        to play MKV files with RealVideo ( RV9/RV10/RV40 ) content. \
+        These files will NOT play on your current setup, you need to \
+        have the DLLs from Real installed. Since they are not free to \
+        distribute, we can't provide them in this pack.\r\n\
+        Select how you want to proceed:"
+        !insertmacro MIOW "Left" "120"
+        !insertmacro MIOW "Right" "315"
+        !insertmacro MIOW "Top" "75"
+        !insertmacro MIOW "Bottom" "125"
+    !insertmacro MIOW_END
+    
+    !insertmacro MIOW_BEGIN "ioSpecial.ini" "Field 5"
+        !insertmacro MIOW "Type" "CheckBox"
+        !insertmacro MIOW "Text" "open browser to download RealPlayer"
+        !insertmacro MIOW "State" "1"
+        !insertmacro MIOW "Left" "120"
+        !insertmacro MIOW "Right" "315"
+        !insertmacro MIOW "Top" "128"
+        !insertmacro MIOW "Bottom" "138"
+    !insertmacro MIOW_END
+    
+    !insertmacro MIOW_BEGIN "ioSpecial.ini" "Field 6"
+        !insertmacro MIOW "Type" "label"
+        !insertmacro MIOW "Text" "Real's full-featured player, but a little intrusive on the system."
+        !insertmacro MIOW "Left" "120"
+        !insertmacro MIOW "Right" "315"
+        !insertmacro MIOW "Top" "138"
+        !insertmacro MIOW "Bottom" "148"
+    !insertmacro MIOW_END
+    
+    !insertmacro MIOW_BEGIN "ioSpecial.ini" "Field 7"
+        !insertmacro MIOW "Type" "CheckBox"
+        !insertmacro MIOW "Text" "open browser to get RealAlternative"
+        !insertmacro MIOW "State" "0"
+        !insertmacro MIOW "Left" "120"
+        !insertmacro MIOW "Right" "315"
+        !insertmacro MIOW "Top" "151"
+        !insertmacro MIOW "Bottom" "161"
+    !insertmacro MIOW_END
+    
+    !insertmacro MIOW_BEGIN "ioSpecial.ini" "Field 8"
+        !insertmacro MIOW "Type" "label"
+        !insertmacro MIOW "Text" "Codec only, small and nice, but not tolerated from Real's side."
+        !insertmacro MIOW "Left" "120"
+        !insertmacro MIOW "Right" "315"
+        !insertmacro MIOW "Top" "161"
+        !insertmacro MIOW "Bottom" "171"
+    !insertmacro MIOW_END
+
+    lblEnd:
+
+FunctionEnd
+
+Function PageFinishShow
+
+    StrCmp $REALNEEDED "" lblEnd
+    
+    GetDlgItem $R0 $MUI_HWND 1202 # 1200 + Field number - 1
+    SetCtlColors $R0 0xFF0000 "transparent"
+    CreateFont $R1 "Tahoma" 10 700
+    SendMessage $R0 ${WM_SETFONT} $R1 0
+    
+    GetDlgItem $R0 $MUI_HWND 1203 # 1200 + Field number - 1
+    SetCtlColors $R0 0x000000 "transparent"
+    
+    GetDlgItem $R0 $MUI_HWND 1204 # 1200 + Field number - 1
+    SetCtlColors $R0 0x000000 "transparent"
+    
+    GetDlgItem $R0 $MUI_HWND 1205 # 1200 + Field number - 1
+    SetCtlColors $R0 0x000000 "transparent"
+    CreateFont $R1 "Tahoma" 7 400
+    SendMessage $R0 ${WM_SETFONT} $R1 0
+    
+    GetDlgItem $R0 $MUI_HWND 1206 # 1200 + Field number - 1
+    SetCtlColors $R0 0x000000 "transparent"
+    
+    GetDlgItem $R0 $MUI_HWND 1207 # 1200 + Field number - 1
+    SetCtlColors $R0 0x000000 "transparent"
+    CreateFont $R1 "Tahoma" 7 400
+    SendMessage $R0 ${WM_SETFONT} $R1 0
+
+    lblEnd:
+
+FunctionEnd
+
+Function PageFinishLeave
+
+    StrCmp $REALNEEDED "" lblEnd
+    
+    !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ioSpecial.ini" "Field 5" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $R1 "ioSpecial.ini" "Field 7" "State"
+    
+    StrCmp $R0 "0" +3
+    WriteINIStr "$PLUGINSDIR\realplayer.url" "InternetShortcut" "URL" "http://www.real.com/"
+    ExecShell open '"$PLUGINSDIR\realplayer.url"' SW_SHOWNORMAL
+    
+    StrCmp $R1 "0" +3
+    WriteINIStr "$PLUGINSDIR\realalternative.url" "InternetShortcut" "URL" "http://google.com/search?q=real%20alternative"
+    ExecShell open '"$PLUGINSDIR\realalternative.url"' SW_SHOWNORMAL
+    
+    lblEnd:
+
+FunctionEnd
+

Modified: trunk/MatroskaPack/Full/ReadMe Matroska Pack Full.nsi
===================================================================
--- trunk/MatroskaPack/Full/ReadMe Matroska Pack Full.nsi	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Full/ReadMe Matroska Pack Full.nsi	2004-08-21 22:02:46 UTC (rev 723)
@@ -1,83 +1,67 @@
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 ; Name:   ReadMe Matroska Pack Full
 ; File:   ReadMe Matroska Pack Full.nsi
-; Date:   2004/03/27
-; Autor:  Nibor
+; Date:   2004/08/21
+; Autor:  nibor
 ; NSIS:   NSIS 2.0
 ; Desc:   Small app to create the ReadMe.html
 ;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Include Modern UI
+;first commands
 
-  !include "MUI.nsh"
+    !include "MUI.nsh"
+    SetCompressor bzip2
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;General Defines
+;general defines
 
-   !define VERSION "1.0.2"
-   !define VERSIONDATE "2004-03-27"
-   !define NAME "Matroska Pack"
-   !define PACK "Full"
-   !define FILE "ReadMe_Matroska_Pack_${PACK}_v${VERSION}"
-   
-   !define READMEFILE "$EXEDIR\ReadMe.html"
+    !define VERSION "1.0.3"
+    !define VERSIONDATE "2004-08-21"
+    !define NAME "Matroska Pack"
+    !define PACK "Full"
+    !define FILE "ReadMe_Matroska_Pack_${PACK}_v${VERSION}"
 
-   !define MAINDIR ".."
-   !define COMPONENTSDIR "${MAINDIR}\Components"
-   !define INCLUDEDIR "${MAINDIR}\Include"
-   !define READMEDIR "${MAINDIR}\ReadMe"
+    !define READMEFILE "$EXEDIR\ReadMe.html"
 
-   !include "${INCLUDEDIR}\Component Defines.nsh"
-   !include "${INCLUDEDIR}\ReadMe Macros.nsh"
-   
-   Var WINDOWSVERSION
-   Var STARTMENU_FOLDER
-   
+    !define MAINDIR ".."
+    !define COMPONENTSDIR "${MAINDIR}\Components"
+    !define INCLUDEDIR "${MAINDIR}\Include"
+    !define FUNCTIONSDIR "${INCLUDEDIR}\functions"
+    !define READMEDIR "${MAINDIR}\ReadMe"
 
+
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Configuration
+;general includes
 
-   SetCompressor bzip2
-   
-   Name "${NAME} ${PACK} ReadMe v${VERSION}"
-   Outfile "${FILE}.exe"
-   
-   InstallDir "$EXEDIR"
+    !include "${INCLUDEDIR}\Component Defines.nsh"
+    !include "${FUNCTIONSDIR}\ReadMe.nsh"
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Interface Settings
+;configuration
 
-   !define MUI_INSTFILESPAGE_PROGRESSBAR smooth
-   !define MUI_INSTFILESPAGE_FINISHHEADER_TEXT "Completed. Visit www.matroska.org for latest matroska release info!"
-   
+    Name "${NAME} ${PACK} ReadMe v${VERSION}"
+    Outfile "${FILE}.exe"
+    InstallDir "$EXEDIR"
 
-;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Pages
 
-   !insertmacro MUI_PAGE_INSTFILES
-
-   !insertmacro MUI_UNPAGE_DIRECTORY
-   !insertmacro MUI_UNPAGE_INSTFILES
-
-
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Languages
+;pages
 
-   !insertmacro MUI_LANGUAGE "English"
+    !insertmacro MUI_PAGE_INSTFILES
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Design Options
+;languages
 
-   !include "${INCLUDEDIR}\Design Options.nsh"
+    !insertmacro MUI_LANGUAGE "English"
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Installer Sections
+;installer sections
 
 ;--------------------------------
 Section -
@@ -99,6 +83,7 @@
         !insertmacro WRITE_README_COMPONENT $R0 "COREAAC"
         !insertmacro WRITE_README_COMPONENT $R0 "COREVORBIS"
         !insertmacro WRITE_README_COMPONENT $R0 "COREFLACDECODER"
+        !insertmacro WRITE_README_COMPONENT $R0 "TTA"
         !insertmacro WRITE_README_COMPONENT $R0 "AC3FILTER"
         !insertmacro WRITE_README_COMPONENT $R0 "MATRIXMIXER"
         !insertmacro WRITE_README_COMPONENT $R0 "FFDSHOW"
@@ -112,7 +97,3 @@
 SectionEnd
 ;--------------------------------
 
-
-
-
-

Modified: trunk/MatroskaPack/Full/ReadMe.html
===================================================================
--- trunk/MatroskaPack/Full/ReadMe.html	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Full/ReadMe.html	2004-08-21 22:02:46 UTC (rev 723)
@@ -6,27 +6,23 @@
 <title>Matroska Pack</title>
 <style type="text/css">
 <!--
+p { font-size:small; }
+a { font-weight:bold; color:#888888; text-decoration:underline }
+a:hover { font-weight:bold; color:#000000; text-decoration:underline }
 th { font-size:small; text-align:left; padding-right:20px; }
 td { font-size:small; padding-right:20px; }
-p { font-size:small; font-weight:normal; }
-a:link { font-weight:bold; color:#888888; text-decoration:underline }
-a:visited { font-weight:bold; color:#888888; text-decoration:underline }
-a:hover { font-weight:bold; color:#000000; text-decoration:underline }
-a:active { font-weight:bold; color:#888888; text-decoration:underline }
-a:focus	{ font-weight:bold; color:#888888; text-decoration:underline }
 -->
 </style>
 </head>
 
 <body style="font-family:Verdana">
-<h3>Matroska Pack Full v1.0.2</h3>
+<h3>Matroska Pack Full v1.0.3</h3>
 <p>The Matroska Pack contains many programs (mainly DirectShow filters) to playback Matroska files.</p>
 <p>Visit <a href="http://www.matroska.org">www.matroska.org</a> if you want to know more about Matroska.</p>
 <p>See <a href="http://packs.matroska.org">packs.matroska.org</a> for updates and information about the Matroska Packs.</p>
 <br>
 <table border="0">
 <tr>
-	<!--<td colspan="4" style="font-size:medium;"><h4>The Matroska Pack Full v1.0.1 contains:</h4></td>-->
 	<th colspan="4">This pack contains:</th>
 </tr>
 <tr>
@@ -42,15 +38,15 @@
 
 <tr>
 <td><a href="http://sourceforge.net/projects/guliverkli/">MatroskaSplitter</a></td>
-<td>v1.0.2.3</td>
-<td>2004-03-11</td>
+<td>v1.0.2.4</td>
+<td>2004-08-16</td>
 <td>Normal and Unicode version</td>
 </tr>
 
 <tr>
 <td><a href="http://sourceforge.net/projects/guliverkli/">MatroskaMuxer</a></td>
-<td>v1.0.0.8</td>
-<td>2003-12-20</td>
+<td>v1.0.0.9</td>
+<td>2004-08-21</td>
 <td></td>
 </tr>
 
@@ -64,7 +60,7 @@
 <tr>
 <td><a href="http://sourceforge.net/projects/guliverkli/">VSFilter</a></td>
 <td>v2.33</td>
-<td>2004-03-08</td>
+<td>2004-08-13</td>
 <td>Normal and Unicode version</td>
 </tr>
 
@@ -78,7 +74,7 @@
 <tr>
 <td><a href="http://coreaac.corecodec.org/">CoreAAC</a></td>
 <td>v1.0b9</td>
-<td>2004-03-12</td>
+<td>2004-07-09</td>
 <td>Binary on <a href="http://www.rarewares.org/aac.html">Rarewares AAC section</a></td>
 </tr>
 
@@ -97,6 +93,13 @@
 </tr>
 
 <tr>
+<td><a href="http://tta.corecodec.org/">TTA</a></td>
+<td></td>
+<td>2004-08-11</td>
+<td>Includes TTA DirectShow Decoder, Encoder and Splitter</td>
+</tr>
+
+<tr>
 <td><a href="http://sourceforge.net/projects/ac3filter/">AC3Filter</a></td>
 <td>v0.70b (DCoder fixed version)</td>
 <td>2003-08-18</td>
@@ -112,8 +115,8 @@
 
 <tr>
 <td><a href="http://sourceforge.net/projects/ffdshow/">ffdshow</a></td>
-<td>2003-05-23</td>
-<td>2003-05-23</td>
+<td>2004-08-21 (decoding only)</td>
+<td>2004-08-21</td>
 <td></td>
 </tr>
 
@@ -129,7 +132,10 @@
 </tr>
 
 </table>
-<p>e-mail to: <b>nibor at matroska.org</b></p>
+<p>
+e-mail to: <b>nibor at matroska.org</b><br />
+IRC: <a href="irc://irc.corecodec.com:6667/#matroska">irc.corecodec.com:6667/#matroska</a>
+</p>
 </body>
 
 </html>

Deleted: trunk/MatroskaPack/Full/ReadMe_original.html

Modified: trunk/MatroskaPack/Include/Component Defines.nsh
===================================================================
--- trunk/MatroskaPack/Include/Component Defines.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/Component Defines.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -1,32 +1,32 @@
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 ; Name:   Matroska Pack
 ; File:   Component Defines.nsh
-; Date:   2004-03-17
-; Autor:  Nibor
+; Date:   2004-08-21
+; Autor:  nibor
 ; NSIS:   NSIS 2.0
 ; Desc:   All the defines for the components here
 ;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Defines
+;defines
 
 !define CRLF "$\r$\n"
 !define TAB "$\t"
 
-!define MATROSKASPLITTER_VERSION "v1.0.2.3"
-!define MATROSKASPLITTER_VERSIONDATE "2004-03-11"
+!define MATROSKASPLITTER_VERSION "v1.0.2.4"
+!define MATROSKASPLITTER_VERSIONDATE "2004-08-16"
 !define MATROSKASPLITTER_NAME "MatroskaSplitter"
 !define MATROSKASPLITTER_FILE "MatroskaSplitter"
 !define MATROSKASPLITTER_URL "http://sourceforge.net/projects/guliverkli/"
 !define MATROSKASPLITTER_COMMENT "Normal and Unicode version"
 
-; Only for compatibility of Uninstaller
+# only for compatibility of Uninstaller
 !define TIMESTAMPMANAGER_NAME "Timestamp Manager"
 !define TIMESTAMPMANAGER_FILE "TimeManager.ax"
 
-!define MATROSKAMUXER_VERSION "v1.0.0.8"
-!define MATROSKAMUXER_VERSIONDATE "2003-12-20"
+!define MATROSKAMUXER_VERSION "v1.0.0.9"
+!define MATROSKAMUXER_VERSIONDATE "2004-08-21"
 !define MATROSKAMUXER_NAME "MatroskaMuxer"
 !define MATROSKAMUXER_FILE "MatroskaMuxer.ax"
 !define MATROSKAMUXER_URL "http://sourceforge.net/projects/guliverkli/"
@@ -40,7 +40,7 @@
 !define MATROSKAPROP_COMMENT "Packs include whole installer executable"
 
 !define VSFILTER_VERSION "v2.33"
-!define VSFILTER_VERSIONDATE "2004-03-08"
+!define VSFILTER_VERSIONDATE "2004-08-13"
 !define VSFILTER_NAME "VSFilter"
 !define VSFILTER_FILE "VSFilter"
 !define VSFILTER_URL "http://sourceforge.net/projects/guliverkli/"
@@ -54,7 +54,7 @@
 !define MMSWITCH_COMMENT "Packs contain different version"
 
 !define COREAAC_VERSION "v1.0b9"
-!define COREAAC_VERSIONDATE "2004-03-12"
+!define COREAAC_VERSIONDATE "2004-07-09"
 !define COREAAC_NAME "CoreAAC"
 !define COREAAC_FILE "CoreAAC.ax"
 !define COREAAC_URL "http://coreaac.corecodec.org/"
@@ -95,8 +95,15 @@
 !define REALMEDIASPLITTER_URL "http://sourceforge.net/projects/guliverkli/"
 !define REALMEDIASPLITTER_COMMENT "Normal and Unicode version"
 
-!define FFDSHOW_VERSION "2003-05-23"
-!define FFDSHOW_VERSIONDATE "2003-05-23"
+!define FFDSHOW_VERSION "2004-08-21 (decoding only)"
+!define FFDSHOW_VERSIONDATE "2004-08-21"
 !define FFDSHOW_NAME "ffdshow"
 !define FFDSHOW_URL "http://sourceforge.net/projects/ffdshow/"
 !define FFDSHOW_COMMENT ""
+
+!define TTA_VERSION ""
+!define TTA_VERSIONDATE "2004-08-11"
+!define TTA_NAME "TTA"
+!define TTA_URL "http://tta.corecodec.org/"
+!define TTA_COMMENT "Includes TTA DirectShow Decoder, Encoder and Splitter"
+

Modified: trunk/MatroskaPack/Include/Description Inserts.nsh
===================================================================
--- trunk/MatroskaPack/Include/Description Inserts.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/Description Inserts.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -21,6 +21,7 @@
       !insertmacro MUI_DESCRIPTION_TEXT ${COREAAC} $(DESC_COREAAC)
       !insertmacro MUI_DESCRIPTION_TEXT ${COREVORBIS} $(DESC_COREVORBIS)
       !insertmacro MUI_DESCRIPTION_TEXT ${COREFLACDECODER} $(DESC_COREFLACDECODER)
+      !insertmacro MUI_DESCRIPTION_TEXT ${TTA} $(DESC_TTA)
       !insertmacro MUI_DESCRIPTION_TEXT ${AC3FILTER} $(DESC_AC3FILTER)
       !insertmacro MUI_DESCRIPTION_TEXT ${MATRIXMIXER} $(DESC_MATRIXMIXER)
       !insertmacro MUI_DESCRIPTION_TEXT ${REALMEDIASPLITTER} $(DESC_REALMEDIASPLITTER)

Modified: trunk/MatroskaPack/Include/Description Language Strings.nsh
===================================================================
--- trunk/MatroskaPack/Include/Description Language Strings.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/Description Language Strings.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -1,8 +1,8 @@
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 ; Name:   Matroska Pack
 ; File:   Description Language Strings.nsh
-; Date:   2003/11/14
-; Autor:  Nibor
+; Date:   2004/08/12
+; Autor:  nibor
 ; NSIS:   NSIS version 2.0 beta 3a
 ; Desc:   LangStrings of description of sections
 ;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
@@ -40,6 +40,9 @@
    LangString DESC_COREFLACDECODER ${LANG_ENGLISH} \
    "DirectShow filter to decode FLAC audio.${CRLF}Version: ${COREFLACDECODER_VERSION} - Date: ${COREFLACDECODER_VERSIONDATE}"
 
+    LangString DESC_TTA ${LANG_ENGLISH} \
+    "DirectShow filter to de-/encode TTA lossless audio.${CRLF}Version: ${TTA_VERSION} - Date: ${TTA_VERSIONDATE}"
+
    LangString DESC_AC3FILTER ${LANG_ENGLISH} \
    "DirectShow filter to decode AC3 audio.${CRLF}Version: ${AC3FILTER_VERSION} - Date: ${AC3FILTER_VERSIONDATE}"
 

Modified: trunk/MatroskaPack/Include/Design Options.nsh
===================================================================
--- trunk/MatroskaPack/Include/Design Options.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/Design Options.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -1,16 +1,16 @@
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 ; Name:   Matroska Pack
 ; File:   Design Options.nsh
-; Date:   2004/03/17
-; Autor:  Nibor
+; Date:   2004/08/21
+; Autor:  nibor
 ; NSIS:   NSIS 2.0
 ; Desc:   non-MUI-like design options
 ;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Design Options
+;design options
 
-    BrandingText "Nibor ${VERSIONDATE} "
+    BrandingText "nibor ${VERSIONDATE} "
     ShowInstDetails hide
     XPStyle on

Deleted: trunk/MatroskaPack/Include/File Association part 1.nsi.txt

Deleted: trunk/MatroskaPack/Include/File Association part 2.nsi.txt

Deleted: trunk/MatroskaPack/Include/File Association.nsh

Deleted: trunk/MatroskaPack/Include/Init InstallDir.nsh

Modified: trunk/MatroskaPack/Include/Interface Settings.nsh
===================================================================
--- trunk/MatroskaPack/Include/Interface Settings.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/Interface Settings.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -1,46 +1,35 @@
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 ; Name:   Matroska Pack
 ; File:   Interface Settings.nsh
-; Date:   2003/12/07
-; Autor:  Nibor
-; NSIS:   NSIS version 2.0 beta 4
+; Date:   2004/08/21
+; Autor:  nibor
+; NSIS:   NSIS 2.0
 ; Desc:   All the defines of the MUI Interface Settings
 ;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Defines
+;defines
 
-   !define MUI_ABORTWARNING
-   
-;   !define MUI_HEADERBITMAP "Matroska.bmp"
-;   !define MUI_HEADERBITMAP_RIGHT
-   
-   ;!define MUI_WELCOMEPAGE_TITLE_3LINES
-   ;!define MUI_WELCOMEPAGE_TITLE "Welcome to the\r\n${NAME} ${PACK} v${VERSION}\r\nSetup Wizard"
-   
-   !define MUI_COMPONENTSPAGE_SMALLDESC
-   
-   ;Start Menu Folder Page Configuration
-   ;InstallDirRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}" "InstallLocation"
-   ;!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
-   ;!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\${NAME}"
-   ;!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "StartmenuFolder"
+    !define MUI_ABORTWARNING
 
-   !define MUI_STARTMENUPAGE_DEFAULTFOLDER "${NAME}"
-   !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
-   !define MUI_STARTMENUPAGE_REGISTRY_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}"
-   !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "StartmenuFolder"
-   
-   !define MUI_INSTFILESPAGE_PROGRESSBAR smooth
-   !define MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT "Visit www.matroska.org for latest matroska release info!"
-   
-   ;!define MUI_FINISHPAGE_NOAUTOCLOSE
-   
-   ;!define MUI_FINISHPAGE_TITLE_3LINES
-   ;!define MUI_FINISHPAGE_TITLE "Completing the\r\n${NAME} ${PACK} v${VERSION}\r\nSetup Wizard"
-   ;!define MUI_FINISHPAGE_NOREBOOTSUPPORT
-   
-   ;!define MUI_FINISHPAGE_RUN
-   ;!define MUI_FINISHPAGE_RUN_TEXT "Configure MatroskaProp now"
-   ;!define MUI_FINISHPAGE_RUN_FUNCTION MatroskaPropConfigure
+    !define MUI_HEADERIMAGE
+    !define MUI_HEADERIMAGE_BITMAP "${MAINDIR}\images\logo_72x57.bmp"
+    !define MUI_HEADERIMAGE_BITMAP_NOSTRETCH
+    !define MUI_HEADERIMAGE_RIGHT
+    !define MUI_UI_HEADERIMAGE_RIGHT "${MAINDIR}\images\modern_headerbmpr.exe"
+
+    !define MUI_ICON "${MAINDIR}\images\matroska.ico"
+
+    !define MUI_COMPONENTSPAGE_SMALLDESC
+
+    !define MUI_STARTMENUPAGE_DEFAULTFOLDER "${NAME}"
+    !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
+    !define MUI_STARTMENUPAGE_REGISTRY_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}"
+    !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "StartmenuFolder"
+
+    !define MUI_INSTFILESPAGE_PROGRESSBAR smooth
+    !define MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT "Visit www.matroska.org for latest matroska release info!"
+    
+    !define MUI_FINISHPAGE_NOREBOOTSUPPORT
+

Modified: trunk/MatroskaPack/Include/Page Defines.nsh
===================================================================
--- trunk/MatroskaPack/Include/Page Defines.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/Page Defines.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -1,25 +1,29 @@
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 ; Name:   Matroska Pack
 ; File:   Page Defines.nsh
-; Date:   2004/03/25
-; Autor:  Nibor
+; Date:   2004/08/21
+; Autor:  nibor
 ; NSIS:   NSIS 2.0
 ; Desc:   All the insertmacros for the MUI pages
 ;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Defines
+;defines
 
-   ;!insertmacro MUI_PAGE_WELCOME
+    !insertmacro MUI_PAGE_LICENSE "${MAINDIR}\GNU General Public License.txt"
 
-    !insertmacro MUI_PAGE_LICENSE "${MAINDIR}\Disclaimer.rtf"
-
-    !insertmacro MUI_PAGE_LICENSE "${MAINDIR}\GNU General Public License.txt"
-   
+    !define MUI_PAGE_HEADER_TEXT "User Guide / Disclaimer"
+    !define MUI_PAGE_HEADER_SUBTEXT "Please read this guide if you are installing a Matroska Pack for the first time."
+    !define MUI_LICENSEPAGE_TEXT_TOP "Press Page Down to see the rest of the guide."
+    !define MUI_LICENSEPAGE_TEXT_BOTTOM "When you have read the guide or if you are already an advanced multimedia user, click the button below. You can also read it later, it is located in the installation directory."
+    !define MUI_LICENSEPAGE_BUTTON "Understood"
+    
+    !insertmacro MUI_PAGE_LICENSE "${MAINDIR}\UserGuide.rtf"
+    
     !ifdef MMSWITCH_CUSTOM
-        !define MUI_PAGE_CUSTOMFUNCTION_PRE MMSwitchUninstallQuestionPre
-        !define MUI_PAGE_CUSTOMFUNCTION_LEAVE MMSwitchUninstallQuestion
+        !define MUI_PAGE_CUSTOMFUNCTION_PRE     MMSwitchUninstallQuestionPre
+        !define MUI_PAGE_CUSTOMFUNCTION_LEAVE   MMSwitchUninstallQuestion
     !endif
     !insertmacro MUI_PAGE_COMPONENTS
    
@@ -28,5 +32,12 @@
     !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
    
     !insertmacro MUI_PAGE_INSTFILES
-   
-    ;!insertmacro MUI_PAGE_FINISH
+    
+    !ifdef PACKFULL
+        !define MUI_PAGE_CUSTOMFUNCTION_PRE     PageFinishPre
+        !define MUI_PAGE_CUSTOMFUNCTION_SHOW    PageFinishShow
+        !define MUI_PAGE_CUSTOMFUNCTION_LEAVE   PageFinishLeave
+        !define MUI_FINISHPAGE_TITLE_3LINES
+        !define MUI_FINISHPAGE_TITLE "Completing the\r\n${NAME} ${PACK} v${VERSION}\r\nSetup Wizard"
+        !insertmacro MUI_PAGE_FINISH
+    !endif

Deleted: trunk/MatroskaPack/Include/ReadMe Macros.nsh

Added: trunk/MatroskaPack/Include/Reserve Files.nsh
===================================================================
--- trunk/MatroskaPack/Include/Reserve Files.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/Reserve Files.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,15 @@
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+; Name:   Matroska Pack
+; File:   Reserve Files.nsh
+; Date:   2004/08/21
+; Autor:  nibor
+; NSIS:   NSIS 2.0
+; Desc:   reserve the necessary files
+;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+    ReserveFile "${MAINDIR}\UserGuide.rtf"
+    ReserveFile "${MAINDIR}\GNU General Public License.txt"
+    !ifdef MUI_HEADERIMAGE_BITMAP
+        ReserveFile "${MUI_HEADERIMAGE_BITMAP}"
+    !endif

Deleted: trunk/MatroskaPack/Include/Section - Begin.nsh

Deleted: trunk/MatroskaPack/Include/Section - End.nsh

Deleted: trunk/MatroskaPack/Include/Section AC3FILTER.nsh

Deleted: trunk/MatroskaPack/Include/Section COREAAC.nsh

Deleted: trunk/MatroskaPack/Include/Section COREFLACDECODER.nsh

Deleted: trunk/MatroskaPack/Include/Section COREVORBIS.nsh

Deleted: trunk/MatroskaPack/Include/Section FFDSHOW.nsh

Deleted: trunk/MatroskaPack/Include/Section MATRIXMIXER.nsh

Deleted: trunk/MatroskaPack/Include/Section MATROSKAMUXER.nsh

Deleted: trunk/MatroskaPack/Include/Section MATROSKAPROP.nsh

Deleted: trunk/MatroskaPack/Include/Section MATROSKASPLITTER.nsh

Deleted: trunk/MatroskaPack/Include/Section MMSWITCH.nsh

Deleted: trunk/MatroskaPack/Include/Section REALMEDIASPLITTER.nsh

Deleted: trunk/MatroskaPack/Include/Section VSFILTER.nsh

Deleted: trunk/MatroskaPack/Include/WindowsVersion Functions.nsh

Added: trunk/MatroskaPack/Include/functions/CheckVersion.nsh
===================================================================
--- trunk/MatroskaPack/Include/functions/CheckVersion.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/functions/CheckVersion.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,59 @@
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+; Name:   Matroska Pack
+; File:   CheckVersion.nsh
+; Date:   2004/08/14
+; Autor:  nibor
+; NSIS:   NSIS 2.0
+; Desc:   check on the web for newer version of pack
+;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+# Needs Strings.nsh because of:
+# StrReplace
+# STR_REPLACE
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;Functions
+
+Function CheckVersion
+
+    !insertmacro STR_REPLACE ${VERSIONDATE} "-" "" $1
+    NSISdl::download_quiet "http://nibor.org/matroska_pack_version" "$PLUGINSDIR\matroska_pack_version"
+    Pop $R0
+    StrCmp $R0 "success" 0 lblCheckVersionFailed
+    MessageBox MB_OK "test, remove file"
+    FileOpen $R0 "$PLUGINSDIR\matroska_pack_version" "r"
+    FileRead $R0 $R1
+    FileRead $R0 $R2
+    FileRead $R0 $R3
+    FileClose $R0
+    StrCmp $R2 "" lblCheckVersionFailed
+    !insertmacro STR_REPLACE $R2 "-" "" $2
+    # $1 = version of installer
+    # $2 = newest version
+    IntOp $3 $2 - $1
+    IntCmp $3 0 lblVersionCurrent lblVersionCurrent lblVersionOutdated
+
+    lblVersionOutdated:
+    Push $R3
+    Push $R2
+    Push $R1
+    Push "outdated"
+    GoTo lblCheckVersionEnd
+
+    lblVersionCurrent:
+    Push ""
+    Push ""
+    Push ""
+    Push "current"
+    GoTo lblCheckVersionEnd
+    
+    lblCheckVersionFailed:
+    Push ""
+    Push ""
+    Push "$R0"
+    Push "failed"
+    GoTo lblCheckVersionEnd
+
+    lblCheckVersionEnd:
+
+FunctionEnd

Added: trunk/MatroskaPack/Include/functions/ReadMe.nsh
===================================================================
--- trunk/MatroskaPack/Include/functions/ReadMe.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/functions/ReadMe.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,71 @@
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+; Name:   ReadMe Macros
+; File:   ReadMe Macros.nsh
+; Date:   2004/02/14
+; Autor:  Nibor
+; NSIS:   NSIS 2.0
+; Desc:   Macros to write HTML-Code for ReadMe
+;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;Defines
+
+!ifndef CRLF
+    !define CRLF "$\r$\n"
+!endif
+
+!ifndef TAB
+    !define TAB "$\t"
+!endif
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;Macros
+
+!macro OPEN_FILE_AT_END FILE_HANDLE FILE_NAME
+
+    FileOpen ${FILE_HANDLE} "${FILE_NAME}" a
+    FileSeek ${FILE_HANDLE} 0 END
+
+!macroend
+
+!macro CLOSE_FILE FILE_HANDLE
+
+    FileClose ${FILE_HANDLE}
+
+!macroend
+
+!macro APPEND_FILES FILE_A FILE_B FILE_X
+
+    ExecWait '$SYSDIR\cmd.exe /C "copy /B "${FILE_A}" + /B "${FILE_B}" "${FILE_X}""'
+
+!macroend
+
+!macro WRITE_README_TITLE FILE_HANDLE
+
+    ;<h3>Matroska Pack ${PACK} vX.X.X</h3>
+    FileWrite ${FILE_HANDLE} '<h3>${NAME} ${PACK} v${VERSION}</h3>${CRLF}'
+
+!macroend
+
+!macro WRITE_README_COMPONENT FILE_HANDLE COMPONENT_NAME
+
+    ; Write HTML-Code like this:
+    ;<tr>
+	;  <td><a href="http://sourceforge.net/projects/guliverkli">MatroskaSplitter</a></td>
+	;  <td>v1.0.2.1</td>
+	;  <td>2004-01-11</td>
+	;  <td>Normal and Unicode version</td>
+    ;</tr>
+
+    FileWrite ${FILE_HANDLE} '${CRLF}\
+    <tr>${CRLF}\
+    $\t<td><a href="${${COMPONENT_NAME}_URL}">${${COMPONENT_NAME}_NAME}</a></td>${CRLF}\
+    ${TAB}<td>${${COMPONENT_NAME}_VERSION}</td>${CRLF}\
+    ${TAB}<td>${${COMPONENT_NAME}_VERSIONDATE}</td>${CRLF}\
+    ${TAB}<td>${${COMPONENT_NAME}_COMMENT}</td>${CRLF}\
+    </tr>${CRLF}'
+    
+    ;Note: ${TAB} is the same as '$\t' but neither of both works here :/
+
+!macroend

Added: trunk/MatroskaPack/Include/functions/Strings.nsh
===================================================================
--- trunk/MatroskaPack/Include/functions/Strings.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/functions/Strings.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,61 @@
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+; Name:   Matroska Pack
+; File:   Strings.nsh
+; Date:   2004/08/14
+; Autor:  nibor
+; NSIS:   NSIS 2.0
+; Desc:   Functions for advanced string manipulation
+;         features: StrReplace
+;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;Macros
+
+!macro STR_REPLACE STRING WHAT WITH RESULT
+    Push "${STRING}"
+    Push "${WHAT}"
+    Push "${WITH}"
+    Call StrReplace
+    Pop ${RESULT}
+!macroend
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;Functions
+
+Function StrReplace
+    # http://nsis.sourceforge.net/archive/nsisweb.php?page=155&instances=0,11,122
+  Exch $R4 ; $R4 = Replacement String
+  Exch
+  Exch $R3 ; $R3 = String to replace (needle)
+  Exch 2
+  Exch $R1 ; $R1 = String to do replacement in (haystack)
+  Push $R2 ; Replaced haystack
+  Push $R5 ; Len (needle)
+  Push $R6 ; len (haystack)
+  Push $R7 ; Scratch reg
+  StrCpy $R2 ""
+  StrLen $R5 $R3
+  StrLen $R6 $R1
+loop:
+  StrCpy $R7 $R1 $R5
+  StrCmp $R7 $R3 found
+  StrCpy $R7 $R1 1 ; - optimization can be removed if U know len needle=1
+  StrCpy $R2 "$R2$R7"
+  StrCpy $R1 $R1 $R6 1
+  StrCmp $R1 "" done loop
+found:
+  StrCpy $R2 "$R2$R4"
+  StrCpy $R1 $R1 $R6 $R5
+  StrCmp $R1 "" done loop
+done:
+  StrCpy $R3 $R2
+  Pop $R7
+  Pop $R6
+  Pop $R5
+  Pop $R2
+  Pop $R1
+  Pop $R4
+  Exch $R3
+FunctionEnd

Added: trunk/MatroskaPack/Include/functions/WindowsVersion.nsh
===================================================================
--- trunk/MatroskaPack/Include/functions/WindowsVersion.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/functions/WindowsVersion.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,127 @@
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+; Name:   Matroska Pack
+; File:   WindowsVersion.nsh
+; Date:   2004/08/14
+; Autor:  nibor
+; NSIS:   NSIS 2.0
+; Desc:   Functions for finding out win version
+;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;Functions
+
+Function GetWindowsNormalOrUnicode
+
+   Call GetWindowsVersion
+   Pop $R1
+
+   StrCmp $R1 '95' lblNormalVersion
+   StrCmp $R1 '98' lblNormalVersion
+   StrCmp $R1 'ME' lblNormalVersion
+
+   StrCmp $R1 '2000' lblUnicodeVersion
+   StrCmp $R1 'XP' lblUnicodeVersion
+   StrCmp $R1 '.NET Server' lblUnicodeVersion
+   StrCpy $R1 $R1 2
+   StrCmp $R1 'NT' lblUnicodeVersion
+
+   lblNormalVersion:
+   StrCpy $WINDOWSVERSION "NormalVersion"
+   Goto lblEnd
+
+   lblUnicodeVersion:
+   StrCpy $WINDOWSVERSION "UnicodeVersion"
+   Goto lblEnd
+
+   lblEnd:
+
+FunctionEnd
+
+
+Function GetWindowsVersion
+
+   # GetWindowsVersion
+   #
+   # Based on Yazno's function, http://yazno.tripod.com/powerpimpit/
+   # Returns on top of stack
+   #
+   # Windows Version (95, 98, ME, NT x.x, 2000, XP, .NET Server)
+   # or
+   # '' (Unknown Windows Version)
+   #
+   # Usage:
+   #   Call GetWindowsVersion
+   #   Pop $R0
+   #   # at this point $R0 is "NT 4.0" or whatnot
+
+   Push $R0
+   Push $R1
+   ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
+   StrCmp $R0 "" 0 lbl_winnt
+   ; we are not NT.
+   ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber
+
+   StrCpy $R1 $R0 1
+   StrCmp $R1 '4' 0 lbl_error
+
+   StrCpy $R1 $R0 3
+
+   StrCmp $R1 '4.0' lbl_win32_95
+   StrCmp $R1 '4.9' lbl_win32_ME lbl_win32_98
+
+   lbl_win32_95:
+      StrCpy $R0 '95'
+      ;StrCpy $R0 'win32'
+   Goto lbl_done
+
+   lbl_win32_98:
+      StrCpy $R0 '98'
+      ;StrCpy $R0 'win32'
+   Goto lbl_done
+
+   lbl_win32_ME:
+      StrCpy $R0 'ME'
+      ;StrCpy $R0 'win32'
+   Goto lbl_done
+
+   lbl_winnt:
+
+      StrCpy $R1 $R0 1
+
+      StrCmp $R1 '3' lbl_winnt_x
+      StrCmp $R1 '4' lbl_winnt_x
+
+      StrCpy $R1 $R0 3
+
+      StrCmp $R1 '5.0' lbl_winnt_2000
+      StrCmp $R1 '5.1' lbl_winnt_XP
+      StrCmp $R1 '5.2' lbl_winnt_dotNET lbl_error
+
+      lbl_winnt_x:
+         StrCpy $R0 "NT $R0" 6
+         ;StrCpy $R0 'winnt'
+      Goto lbl_done
+
+      lbl_winnt_2000:
+         Strcpy $R0 '2000'
+         ;Strcpy $R0 'winnt'
+      Goto lbl_done
+
+      lbl_winnt_XP:
+         Strcpy $R0 'XP'
+         ;Strcpy $R0 'winnt'
+      Goto lbl_done
+
+      lbl_winnt_dotNET:
+         Strcpy $R0 '.NET Server'
+         ;Strcpy $R0 'winnt'
+      Goto lbl_done
+
+   lbl_error:
+      Strcpy $R0 ''
+   lbl_done:
+   Pop $R1
+   Exch $R0
+
+FunctionEnd

Deleted: trunk/MatroskaPack/Include/ioSpecial.ini

Added: trunk/MatroskaPack/Include/sections/- Begin.nsh
===================================================================
--- trunk/MatroskaPack/Include/sections/- Begin.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/sections/- Begin.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,33 @@
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+; Name:   Matroska Pack
+; File:   Section - Begin.nsh
+; Date:   2004/03/25
+; Autor:  Nibor
+; NSIS:   NSIS 2.0
+; Desc:   Main Section before all other sections
+;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;Installer Sections
+
+;--------------------------------
+Section -Begin
+
+    SetOutPath $INSTDIR
+    
+    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+    
+        ;Create Shortcuts
+        CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
+        
+    !insertmacro MUI_STARTMENU_WRITE_END
+    
+    IntCmp $MMSWITCH_UNINSTALL 1 0 lblAfterMMSwitchUninstall lblAfterMMSwitchUninstall
+    UnRegDLL "$INSTDIR\MMSwitch\${MMSWITCH_NAME}.ax"
+    UnRegDLL "$INSTDIR\MMSwitch\${MMSWITCH_NAME}.dll"
+    RMDir /r "$INSTDIR\MMSwitch"
+    lblAfterMMSwitchUninstall:
+    
+SectionEnd
+;--------------------------------

Added: trunk/MatroskaPack/Include/sections/- End.nsh
===================================================================
--- trunk/MatroskaPack/Include/sections/- End.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/sections/- End.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,43 @@
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+; Name:   Matroska Pack
+; File:   Section - End.nsh
+; Date:   2004/08/14
+; Autor:  nibor
+; NSIS:   NSIS 2.0
+; Desc:   Main Section after other sections
+;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;Installer Sections
+
+;--------------------------------
+Section -End
+
+    File "${MAINDIR}\images\matroska.ico"
+    File "${MAINDIR}\GNU General Public License.rtf"
+    File "${MAINDIR}\UserGuide.html"
+    File "${MAINDIR}\${PACK}\ReadMe.html"
+
+;   WriteUninstaller "$INSTDIR\Uninstall.exe"
+    File /oname=Uninstall.exe "${MAINDIR}\uninstaller\uninstall_${VERSIONDATE}.exe"
+    WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}" "DisplayName" "${NAME} (remove only)"
+    WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}" "DisplayIcon" "$INSTDIR\matroska.ico,0"
+    WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}" "InstallLocation" "$INSTDIR"
+    WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}" "UninstallString" "$INSTDIR\Uninstall.exe"
+    WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}" "NoModify" 1
+    WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}" "NoRepair" 1
+         
+    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+
+        ;Create Shortcuts
+        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\ReadMe.lnk" "$INSTDIR\ReadMe.html"
+        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\UserGuide.lnk" "$INSTDIR\UserGuide.html"
+
+    !insertmacro MUI_STARTMENU_WRITE_END
+
+SectionEnd
+;--------------------------------
+
+;!insertmacro MUI_SECTIONS_FINISHHEADER

Added: trunk/MatroskaPack/Include/sections/AC3FILTER.nsh
===================================================================
--- trunk/MatroskaPack/Include/sections/AC3FILTER.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/sections/AC3FILTER.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,42 @@
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+; Name:   Matroska Pack
+; File:   Section AC3FILTER.nsh
+; Date:   2004/02/14
+; Autor:  nibor
+; NSIS:   NSIS 2.0
+; Desc:   Section of component AC3Filter
+;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;Installer Sections
+
+;--------------------------------
+Section "${AC3FILTER_NAME} ${AC3FILTER_VERSION}" AC3FILTER
+
+    !ifdef INST_TYPE
+        SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+    !endif
+
+    IfFileExists "$INSTDIR\AC3Filter\${AC3FILTER_FILE}" 0 lblAfterAC3FILTER
+    UnRegDLL "$INSTDIR\AC3Filter\${AC3FILTER_FILE}"
+    RMDir /r "$INSTDIR\AC3Filter"
+
+    lblAfterAC3FILTER:
+    File /r "${COMPONENTSDIR}\AC3Filter"
+    RegDLL "$INSTDIR\AC3Filter\${AC3FILTER_FILE}"
+   
+    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+
+    ;Create Shortcuts
+    CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER\AC3Filter"
+    SetOutPath "$INSTDIR\AC3Filter"
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\AC3Filter\Configuration.lnk" "$SYSDIR\rundll32.exe" "ac3filter.ax,config" "$INSTDIR\AC3Filter\ac3filter.ax" 0
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\AC3Filter\Help.lnk" "$INSTDIR\AC3Filter\ac3filter_eng.html"
+    CreateShortCut "$INSTDIR\AC3Filter\Configuration.lnk" "$SYSDIR\rundll32.exe" "ac3filter.ax,config" "$INSTDIR\AC3Filter\ac3filter.ax" 0
+    SetOutPath "$INSTDIR"
+
+    !insertmacro MUI_STARTMENU_WRITE_END
+   
+SectionEnd
+;--------------------------------

Added: trunk/MatroskaPack/Include/sections/COREAAC.nsh
===================================================================
--- trunk/MatroskaPack/Include/sections/COREAAC.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/sections/COREAAC.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,30 @@
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+; Name:   Matroska Pack
+; File:   Section COREAAC.nsh
+; Date:   2004/08/12
+; Autor:  nibor
+; NSIS:   NSIS 2.0
+; Desc:   Section of component CoreAAC
+;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;Installer Sections
+
+;--------------------------------
+Section "${COREAAC_NAME} ${COREAAC_VERSION}" COREAAC
+
+    !ifdef INST_TYPE
+        SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+    !endif
+
+    IfFileExists "$INSTDIR\${COREAAC_FILE}" 0 lblAfterCOREAAC
+    UnRegDLL "$INSTDIR\${COREAAC_FILE}"
+    Delete "$INSTDIR\${COREAAC_FILE}"
+
+    lblAfterCOREAAC:
+    File "${COMPONENTSDIR}\core_audio\${COREAAC_FILE}"
+    RegDLL "$INSTDIR\${COREAAC_FILE}"
+   
+SectionEnd
+;--------------------------------

Added: trunk/MatroskaPack/Include/sections/COREFLACDECODER.nsh
===================================================================
--- trunk/MatroskaPack/Include/sections/COREFLACDECODER.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/sections/COREFLACDECODER.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,30 @@
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+; Name:   Matroska Pack
+; File:   Section COREFLACDECODER.nsh
+; Date:   2004/08/12
+; Autor:  nibor
+; NSIS:   NSIS 2.0
+; Desc:   Section of component CoreFLAC Decoder
+;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;Installer Sections
+
+;--------------------------------
+Section "${COREFLACDECODER_NAME} ${COREFLACDECODER_VERSION}" COREFLACDECODER
+
+    !ifdef INST_TYPE
+        SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+    !endif
+
+    IfFileExists "$INSTDIR\${COREFLACDECODER_FILE}" 0 lblAfterCOREFLACDECODER
+    UnRegDLL "$INSTDIR\${COREFLACDECODER_FILE}"
+    Delete "$INSTDIR\${COREFLACDECODER_FILE}"
+
+    lblAfterCOREFLACDECODER:
+    File "${COMPONENTSDIR}\core_audio\${COREFLACDECODER_FILE}"
+    RegDLL "$INSTDIR\${COREFLACDECODER_FILE}"
+   
+SectionEnd
+;--------------------------------

Added: trunk/MatroskaPack/Include/sections/COREVORBIS.nsh
===================================================================
--- trunk/MatroskaPack/Include/sections/COREVORBIS.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/sections/COREVORBIS.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,30 @@
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+; Name:   Matroska Pack
+; File:   Section COREVORBIS.nsh
+; Date:   2004/08/12
+; Autor:  nibor
+; NSIS:   NSIS 2.0
+; Desc:   Section of component CoreVorbis
+;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;Installer Sections
+
+;--------------------------------
+Section "${COREVORBIS_NAME} ${COREVORBIS_VERSION}" COREVORBIS
+
+    !ifdef INST_TYPE
+        SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+    !endif
+
+    IfFileExists "$INSTDIR\${COREVORBIS_FILE}" 0 lblAfterCOREVORBIS
+    UnRegDLL "$INSTDIR\${COREVORBIS_FILE}"
+    Delete "$INSTDIR\${COREVORBIS_FILE}"
+
+    lblAfterCOREVORBIS:
+    File "${COMPONENTSDIR}\core_audio\${COREVORBIS_FILE}"
+    RegDLL "$INSTDIR\${COREVORBIS_FILE}"
+   
+SectionEnd
+;--------------------------------

Added: trunk/MatroskaPack/Include/sections/FFDSHOW.nsh
===================================================================
--- trunk/MatroskaPack/Include/sections/FFDSHOW.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/sections/FFDSHOW.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,196 @@
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+; Name:   Matroska Pack
+; File:   Section FFDSHOW.nsh
+; Date:   2004/08/16
+; Autor:  nibor
+; NSIS:   NSIS 2.0
+; Desc:   Section of component ffdshow
+;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;general defines
+
+    !define SF_SELECTED       0x00000001
+    !define SF_RO             0x00000010
+   
+    !define SF_SELECTED_OFF   0xFFFFFFFE
+    !define SF_RO_OFF         0xFFFFFFEF
+   
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;installer sections
+
+;--------------------------------
+Section "${FFDSHOW_NAME} ${FFDSHOW_VERSION}" FFDSHOW
+
+    !ifdef INST_TYPE
+        SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+    !endif
+
+    ReadRegStr $R0 HKLM "SOFTWARE\GNU\ffdshow" "pth"
+    StrCmp $R0 "" lblAfterFFDSHOWDeinstall
+    IfFileExists "$R0\ffdshow.ax" 0 lblAfterFFDSHOWDeinstall
+    StrCmp "$R0" "$INSTDIR\ffdshow" lblDeleteFFDSHOWFiles lblAfterDeleteFFDSHOWFiles
+    lblDeleteFFDSHOWFiles:
+    UnRegDLL "$R0\ffdshow.ax"
+    RMDir /r "$R0"
+    lblAfterDeleteFFDSHOWFiles:
+    MessageBox MB_YESNO|MB_ICONQUESTION "Would you like to keep your old ffdshow settings?" IDYES lblKeepFFDSHOWSettings
+    DeleteRegKey HKLM "SOFTWARE\GNU\ffdshow"
+    Goto lblAfterFFDSHOWDeinstall
+
+    lblKeepFFDSHOWSettings:
+    StrCpy $R1 "KeepFFDSHOWSettings"
+
+    lblAfterFFDSHOWDeinstall:
+
+    File /r "${COMPONENTSDIR}\ffdshow"
+    RegDLL "$INSTDIR\ffdshow\ffdshow.ax"
+    WriteRegStr HKLM "SOFTWARE\GNU\ffdshow" "pth" "$INSTDIR\ffdshow"
+   
+    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+
+    ;Create Shortcuts
+    CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER\ffdshow"
+    SetOutPath "$INSTDIR\ffdshow"
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\ffdshow\Configuration.lnk" "$SYSDIR\rundll32.exe" "ffdshow.ax,configure" "$INSTDIR\ffdshow\ffdshow.ax" 0
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\ffdshow\Help.lnk" "$INSTDIR\ffdshow\help\HomePage.html"
+    CreateShortCut "$INSTDIR\ffdshow\Configuration.lnk" "$SYSDIR\rundll32.exe" "ffdshow.ax,configure" "$INSTDIR\ffdshow\ffdshow.ax" 0
+    SetOutPath "$INSTDIR"
+
+    !insertmacro MUI_STARTMENU_WRITE_END
+
+SectionEnd
+
+SubSection "${FFDSHOW_NAME} settings" FFDSHOW_SETTINGS
+
+    Section "Overlay mixer" FFDSHOW_OVERLAYMIXER
+        !ifdef INST_TYPE
+            SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+        !endif
+        StrCmp $R1 "KeepFFDSHOWSettings" +2
+        WriteRegDWORD HKLM "SOFTWARE\GNU\ffdshow" "hwOverlay" 1
+    SectionEnd
+
+    Section "XVID" FFDSHOW_XVID
+        !ifdef INST_TYPE
+            SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+        !endif
+        StrCmp $R1 "KeepFFDSHOWSettings" +2
+        WriteRegDWORD HKLM "SOFTWARE\GNU\ffdshow" "xvid" 1
+    SectionEnd
+
+    Section "DIVX 3" FFDSHOW_DIVX3
+        !ifdef INST_TYPE
+            SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+        !endif
+        StrCmp $R1 "KeepFFDSHOWSettings" +2
+        WriteRegDWORD HKLM "SOFTWARE\GNU\ffdshow" "div3" 1
+    SectionEnd
+
+    Section "DIVX 4" FFDSHOW_DIVX4
+        !ifdef INST_TYPE
+            SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+        !endif
+        StrCmp $R1 "KeepFFDSHOWSettings" +2
+        WriteRegDWORD HKLM "SOFTWARE\GNU\ffdshow" "divx" 1
+    SectionEnd
+
+    Section "DIVX 5" FFDSHOW_DIVX5
+        !ifdef INST_TYPE
+            SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+        !endif
+        StrCmp $R1 "KeepFFDSHOWSettings" +2
+        WriteRegDWORD HKLM "SOFTWARE\GNU\ffdshow" "dx50" 1
+    SectionEnd
+
+    Section "MS MPEG4v3" FFDSHOW_MSMPEG43
+        !ifdef INST_TYPE
+            SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+        !endif
+        StrCmp $R1 "KeepFFDSHOWSettings" +2
+        WriteRegDWORD HKLM "SOFTWARE\GNU\ffdshow" "mp43" 1
+    SectionEnd
+
+    Section "MS MPEG4v2" FFDSHOW_MSMPEG42
+        !ifdef INST_TYPE
+            SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+        !endif
+        StrCmp $R1 "KeepFFDSHOWSettings" +2
+        WriteRegDWORD HKLM "SOFTWARE\GNU\ffdshow" "mp42" 1
+    SectionEnd
+
+    Section "MS MPEG4v1" FFDSHOW_MSMPEG41
+        !ifdef INST_TYPE
+            SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+        !endif
+        StrCmp $R1 "KeepFFDSHOWSettings" +2
+        WriteRegDWORD HKLM "SOFTWARE\GNU\ffdshow" "mp41" 1
+    SectionEnd
+
+    Section "Windows Media Video 1" FFDSHOW_WMV1
+        !ifdef INST_TYPE
+            SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+        !endif
+        StrCmp $R1 "KeepFFDSHOWSettings" +2
+        WriteRegDWORD HKLM "SOFTWARE\GNU\ffdshow" "wmv1" 1
+    SectionEnd
+
+SubSectionEnd
+;--------------------------------
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;Functions
+
+
+Function CheckFFDSHOW
+
+   SectionGetFlags ${FFDSHOW} $R0
+   IntOp $R1 $R0 & ${SF_SELECTED}
+   IntCmp $R1 ${SF_SELECTED} lblFFDSHOWSelected
+	
+   ;ffdshow NOT selected
+   SectionGetFlags ${FFDSHOW_SETTINGS} $R0
+      IntOp $R1 $R0 | ${SF_RO} ;enable flag RO (Read Only)
+   SectionSetFlags ${FFDSHOW_SETTINGS} $R1
+   ;Set flags of sections in FFDSHOW_SETTINGS
+   SectionGetFlags ${FFDSHOW_OVERLAYMIXER} $R0
+      IntOp $R1 $R0 | ${SF_RO} ;enable flag RO (Read Only)
+      IntOp $R1 $R1 & ${SF_SELECTED_OFF} ;disable flag SELECTED
+   SectionSetFlags ${FFDSHOW_OVERLAYMIXER} $R1
+   SectionSetFlags ${FFDSHOW_XVID} $R1
+   SectionSetFlags ${FFDSHOW_DIVX3} $R1
+   SectionSetFlags ${FFDSHOW_DIVX4} $R1
+   SectionSetFlags ${FFDSHOW_DIVX5} $R1
+   SectionSetFlags ${FFDSHOW_MSMPEG43} $R1
+   SectionSetFlags ${FFDSHOW_MSMPEG42} $R1
+   SectionSetFlags ${FFDSHOW_MSMPEG41} $R1
+   SectionSetFlags ${FFDSHOW_WMV1} $R1
+   Goto lblCheckFFDSHOWEnd
+
+   ;ffdshow selected
+   lblFFDSHOWSelected:
+   SectionGetFlags ${FFDSHOW_SETTINGS} $R0
+      IntOp $R1 $R0 & ${SF_RO}
+      IntCmp $R1 ${SF_RO} 0 lblCheckFFDSHOWEnd lblCheckFFDSHOWEnd
+      IntOp $R1 $R0 & ${SF_RO_OFF} ;disable flag RO
+   SectionSetFlags ${FFDSHOW_SETTINGS} $R1
+   ;set flags of sections in FFDSHOW_SETTINGS
+   SectionGetFlags ${FFDSHOW_OVERLAYMIXER} $R0
+      IntOp $R1 $R0 & ${SF_RO_OFF} ;disable flag RO
+      IntOp $R1 $R1 | ${SF_SELECTED} ;enable flag SELECTED
+   SectionSetFlags ${FFDSHOW_OVERLAYMIXER} $R1
+   SectionSetFlags ${FFDSHOW_XVID} $R1
+   SectionSetFlags ${FFDSHOW_DIVX3} $R1
+   SectionSetFlags ${FFDSHOW_DIVX4} $R1
+   SectionSetFlags ${FFDSHOW_DIVX5} $R1
+   SectionSetFlags ${FFDSHOW_MSMPEG43} $R1
+   SectionSetFlags ${FFDSHOW_MSMPEG42} $R1
+   SectionSetFlags ${FFDSHOW_MSMPEG41} $R1
+   SectionSetFlags ${FFDSHOW_WMV1} $R1
+
+   lblCheckFFDSHOWEnd:
+   
+FunctionEnd

Added: trunk/MatroskaPack/Include/sections/FFDSHOW_.nsh
===================================================================
--- trunk/MatroskaPack/Include/sections/FFDSHOW_.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/sections/FFDSHOW_.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,197 @@
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+; Name:   Matroska Pack
+; File:   Section FFDSHOW.nsh
+; Date:   2004/08/12
+; Autor:  nibor
+; NSIS:   NSIS 2.0
+; Desc:   Section of component ffdshow
+;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;General Defines
+
+    !define SF_SELECTED       0x00000001
+    !define SF_RO             0x00000010
+   
+    !define SF_SELECTED_OFF   0xFFFFFFFE
+    !define SF_RO_OFF         0xFFFFFFEF
+   
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;Installer Sections
+
+;--------------------------------
+Section "${FFDSHOW_NAME} ${FFDSHOW_VERSION}" FFDSHOW
+
+    !ifdef INST_TYPE
+        SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+    !endif
+
+    ReadRegStr $R0 HKLM "SOFTWARE\GNU\ffdshow" "pth"
+    StrCmp $R0 "" lblAfterFFDSHOWDeinstall
+    IfFileExists "$R0\ffdshow.ax" 0 lblAfterFFDSHOWDeinstall
+    StrCmp "$R0" "$INSTDIR\ffdshow" lblDeleteFFDSHOWFiles lblAfterDeleteFFDSHOWFiles
+    ;MessageBox MB_YESNO|MB_ICONQUESTION "A previous installation of ffdshow has been detected, would you like to uninstall it before continuing?" IDNO lblAfterFFDShowDeinstall
+    lblDeleteFFDSHOWFiles:
+    UnRegDLL "$R0\ffdshow.ax"
+    RMDir /r "$R0"
+    lblAfterDeleteFFDSHOWFiles:
+    MessageBox MB_YESNO|MB_ICONQUESTION "Would you like to keep your old ffdshow settings?" IDYES lblKeepFFDSHOWSettings
+    DeleteRegKey HKLM "SOFTWARE\GNU\ffdshow"
+    Goto lblAfterFFDSHOWDeinstall
+
+    lblKeepFFDSHOWSettings:
+    StrCpy $R1 "KeepFFDSHOWSettings"
+
+    lblAfterFFDSHOWDeinstall:
+
+    File /r "${COMPONENTSDIR}\ffdshow"
+    RegDLL "$INSTDIR\ffdshow\ffdshow.ax"
+    WriteRegStr HKLM "SOFTWARE\GNU\ffdshow" "pth" "$INSTDIR\ffdshow"
+   
+    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+
+    ;Create Shortcuts
+    CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER\ffdshow"
+    SetOutPath "$INSTDIR\ffdshow"
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\ffdshow\Configuration.lnk" "$SYSDIR\rundll32.exe" "ffdshow.ax,configure" "$INSTDIR\ffdshow\ffdshow.ax" 0
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\ffdshow\Help.lnk" "$INSTDIR\ffdshow\help\index.html"
+    CreateShortCut "$INSTDIR\ffdshow\Configuration.lnk" "$SYSDIR\rundll32.exe" "ffdshow.ax,configure" "$INSTDIR\ffdshow\ffdshow.ax" 0
+    SetOutPath "$INSTDIR"
+
+    !insertmacro MUI_STARTMENU_WRITE_END
+
+SectionEnd
+
+SubSection "${FFDSHOW_NAME} settings" FFDSHOW_SETTINGS
+
+    Section "Overlay mixer" FFDSHOW_OVERLAYMIXER
+        !ifdef INST_TYPE
+            SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+        !endif
+        StrCmp $R1 "KeepFFDSHOWSettings" +2
+        WriteRegDWORD HKLM "SOFTWARE\GNU\ffdshow" "hwOverlay" 1
+    SectionEnd
+
+    Section "XVID" FFDSHOW_XVID
+        !ifdef INST_TYPE
+            SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+        !endif
+        StrCmp $R1 "KeepFFDSHOWSettings" +2
+        WriteRegDWORD HKLM "SOFTWARE\GNU\ffdshow" "xvid" 1
+    SectionEnd
+
+    Section "DIVX 3" FFDSHOW_DIVX3
+        !ifdef INST_TYPE
+            SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+        !endif
+        StrCmp $R1 "KeepFFDSHOWSettings" +2
+        WriteRegDWORD HKLM "SOFTWARE\GNU\ffdshow" "div3" 1
+    SectionEnd
+
+    Section "DIVX 4" FFDSHOW_DIVX4
+        !ifdef INST_TYPE
+            SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+        !endif
+        StrCmp $R1 "KeepFFDSHOWSettings" +2
+        WriteRegDWORD HKLM "SOFTWARE\GNU\ffdshow" "divx" 1
+    SectionEnd
+
+    Section "DIVX 5" FFDSHOW_DIVX5
+        !ifdef INST_TYPE
+            SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+        !endif
+        StrCmp $R1 "KeepFFDSHOWSettings" +2
+        WriteRegDWORD HKLM "SOFTWARE\GNU\ffdshow" "dx50" 1
+    SectionEnd
+
+    Section "MS MPEG4v3" FFDSHOW_MSMPEG43
+        !ifdef INST_TYPE
+            SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+        !endif
+        StrCmp $R1 "KeepFFDSHOWSettings" +2
+        WriteRegDWORD HKLM "SOFTWARE\GNU\ffdshow" "mp43" 1
+    SectionEnd
+
+    Section "MS MPEG4v2" FFDSHOW_MSMPEG42
+        !ifdef INST_TYPE
+            SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+        !endif
+        StrCmp $R1 "KeepFFDSHOWSettings" +2
+        WriteRegDWORD HKLM "SOFTWARE\GNU\ffdshow" "mp42" 1
+    SectionEnd
+
+    Section "MS MPEG4v1" FFDSHOW_MSMPEG41
+        !ifdef INST_TYPE
+            SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+        !endif
+        StrCmp $R1 "KeepFFDSHOWSettings" +2
+        WriteRegDWORD HKLM "SOFTWARE\GNU\ffdshow" "mp41" 1
+    SectionEnd
+
+    Section "Windows Media Video 1" FFDSHOW_WMV1
+        !ifdef INST_TYPE
+            SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+        !endif
+        StrCmp $R1 "KeepFFDSHOWSettings" +2
+        WriteRegDWORD HKLM "SOFTWARE\GNU\ffdshow" "wmv1" 1
+    SectionEnd
+
+SubSectionEnd
+;--------------------------------
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;Functions
+
+
+Function CheckFFDSHOW
+
+   SectionGetFlags ${FFDSHOW} $R0
+   IntOp $R1 $R0 & ${SF_SELECTED}
+   IntCmp $R1 ${SF_SELECTED} lblFFDSHOWSelected
+	
+   ;ffdshow NOT selected
+   SectionGetFlags ${FFDSHOW_SETTINGS} $R0
+      IntOp $R1 $R0 | ${SF_RO} ;enable flag RO (Read Only)
+   SectionSetFlags ${FFDSHOW_SETTINGS} $R1
+   ;Set flags of sections in FFDSHOW_SETTINGS
+   SectionGetFlags ${FFDSHOW_OVERLAYMIXER} $R0
+      IntOp $R1 $R0 | ${SF_RO} ;enable flag RO (Read Only)
+      IntOp $R1 $R1 & ${SF_SELECTED_OFF} ;disable flag SELECTED
+   SectionSetFlags ${FFDSHOW_OVERLAYMIXER} $R1
+   SectionSetFlags ${FFDSHOW_XVID} $R1
+   SectionSetFlags ${FFDSHOW_DIVX3} $R1
+   SectionSetFlags ${FFDSHOW_DIVX4} $R1
+   SectionSetFlags ${FFDSHOW_DIVX5} $R1
+   SectionSetFlags ${FFDSHOW_MSMPEG43} $R1
+   SectionSetFlags ${FFDSHOW_MSMPEG42} $R1
+   SectionSetFlags ${FFDSHOW_MSMPEG41} $R1
+   SectionSetFlags ${FFDSHOW_WMV1} $R1
+   Goto lblCheckFFDSHOWEnd
+
+   ;ffdshow selected
+   lblFFDSHOWSelected:
+   SectionGetFlags ${FFDSHOW_SETTINGS} $R0
+      IntOp $R1 $R0 & ${SF_RO}
+      IntCmp $R1 ${SF_RO} 0 lblCheckFFDSHOWEnd lblCheckFFDSHOWEnd
+      IntOp $R1 $R0 & ${SF_RO_OFF} ;disable flag RO
+   SectionSetFlags ${FFDSHOW_SETTINGS} $R1
+   ;set flags of sections in FFDSHOW_SETTINGS
+   SectionGetFlags ${FFDSHOW_OVERLAYMIXER} $R0
+      IntOp $R1 $R0 & ${SF_RO_OFF} ;disable flag RO
+      IntOp $R1 $R1 | ${SF_SELECTED} ;enable flag SELECTED
+   SectionSetFlags ${FFDSHOW_OVERLAYMIXER} $R1
+   SectionSetFlags ${FFDSHOW_XVID} $R1
+   SectionSetFlags ${FFDSHOW_DIVX3} $R1
+   SectionSetFlags ${FFDSHOW_DIVX4} $R1
+   SectionSetFlags ${FFDSHOW_DIVX5} $R1
+   SectionSetFlags ${FFDSHOW_MSMPEG43} $R1
+   SectionSetFlags ${FFDSHOW_MSMPEG42} $R1
+   SectionSetFlags ${FFDSHOW_MSMPEG41} $R1
+   SectionSetFlags ${FFDSHOW_WMV1} $R1
+
+   lblCheckFFDSHOWEnd:
+   
+FunctionEnd

Added: trunk/MatroskaPack/Include/sections/MATRIXMIXER.nsh
===================================================================
--- trunk/MatroskaPack/Include/sections/MATRIXMIXER.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/sections/MATRIXMIXER.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,42 @@
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+; Name:   Matroska Pack
+; File:   Section MATRIXMIXER.nsh
+; Date:   2004/02/14
+; Autor:  Nibor
+; NSIS:   NSIS 2.0
+; Desc:   Section of component MatrixMixer
+;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;Installer Sections
+
+;--------------------------------
+Section "${MATRIXMIXER_NAME} ${MATRIXMIXER_VERSION}" MATRIXMIXER
+
+    !ifdef INST_TYPE
+        SectionIn ${INST_TYPE_FULL}
+    !endif
+
+    IfFileExists "$INSTDIR\MatrixMixer\${MATRIXMIXER_FILE}" 0 lblAfterMATRIXMIXER
+    UnRegDLL "$INSTDIR\MatrixMixer\${MATRIXMIXER_FILE}"
+    RMDir /r "$INSTDIR\MatrixMixer"
+   
+    lblAfterMATRIXMIXER:
+    File /r "${COMPONENTSDIR}\MatrixMixer"
+    RegDLL "$INSTDIR\MatrixMixer\${MATRIXMIXER_FILE}"
+   
+    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+
+    ;Create Shortcuts
+    CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER\MatrixMixer"
+    SetOutPath "$INSTDIR\MatrixMixer"
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\MatrixMixer\Configuration.lnk" "$SYSDIR\rundll32.exe" "matrix_mixer.ax,config"
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\MatrixMixer\Help.lnk" "$INSTDIR\MatrixMixer\matrix_mixer_eng.html"
+    CreateShortCut "$INSTDIR\MatrixMixer\Configuration.lnk" "$SYSDIR\rundll32.exe" "matrix_mixer.ax,config"
+    SetOutPath "$INSTDIR"
+
+    !insertmacro MUI_STARTMENU_WRITE_END
+   
+SectionEnd
+;--------------------------------

Added: trunk/MatroskaPack/Include/sections/MATROSKAMUXER.nsh
===================================================================
--- trunk/MatroskaPack/Include/sections/MATROSKAMUXER.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/sections/MATROSKAMUXER.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,30 @@
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+; Name:   Matroska Pack
+; File:   Section MATROSKAMUXER.nsh
+; Date:   2004/08/12
+; Autor:  nibor
+; NSIS:   NSIS 2.0
+; Desc:   Section of component MatroskaMuxer
+;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;Installer Sections
+
+;--------------------------------
+Section "${MATROSKAMUXER_NAME} ${MATROSKAMUXER_VERSION}" MATROSKAMUXER
+
+    !ifdef INST_TYPE
+        SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+    !endif
+
+    IfFileExists "$INSTDIR\${MATROSKAMUXER_FILE}" 0 lblAfterMATROSKAMUXER
+    UnRegDLL "$INSTDIR\${MATROSKAMUXER_FILE}"
+    Delete "$INSTDIR\${MATROSKAMUXER_FILE}"
+   
+    lblAfterMATROSKAMUXER:
+    File "${COMPONENTSDIR}\guliverkli\${MATROSKAMUXER_FILE}"
+    RegDLL "$INSTDIR\${MATROSKAMUXER_FILE}"
+   
+SectionEnd
+;--------------------------------

Added: trunk/MatroskaPack/Include/sections/MATROSKAPROP.nsh
===================================================================
--- trunk/MatroskaPack/Include/sections/MATROSKAPROP.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/sections/MATROSKAPROP.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,30 @@
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+; Name:   Matroska Pack
+; File:   Section MATROSKAPROP.nsh
+; Date:   2004/02/14
+; Autor:  Nibor
+; NSIS:   NSIS 2.0
+; Desc:   Section of component MatroskaProp
+;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;Installer Sections
+
+;--------------------------------
+Section "${MATROSKAPROP_NAME} ${MATROSKAPROP_VERSION}" MATROSKAPROP
+
+    !ifdef INST_TYPE
+        SectionIn ${INST_TYPE_FULL}
+    !endif
+
+    ; alternatively I could extract it to temp ($PLUGINSDIR) and then delete
+    ; File /oname=$PLUGINSDIR\${MATROSKAPROP_FILE} "${COMPONENTSDIR}\${MATROSKAPROP_FILE}"
+    File "${COMPONENTSDIR}\${MATROSKAPROP_FILE}"
+    ExecWait "$INSTDIR\${MATROSKAPROP_FILE}"
+;    Delete "$INSTDIR\${MATROSKAPROP_FILE}"
+    
+    WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}" "MatroskaPropInstalled" 1
+   
+SectionEnd
+;--------------------------------

Added: trunk/MatroskaPack/Include/sections/MATROSKASPLITTER.nsh
===================================================================
--- trunk/MatroskaPack/Include/sections/MATROSKASPLITTER.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/sections/MATROSKASPLITTER.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,41 @@
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+; Name:   Matroska Pack
+; File:   Section MATROSKASPLITTER.nsh
+; Date:   2004/08/12
+; Autor:  nibor
+; NSIS:   NSIS 2.0
+; Desc:   Section of component MatroskaSplitter
+;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;Installer Sections
+
+;--------------------------------
+Section "${MATROSKASPLITTER_NAME} ${MATROSKASPLITTER_VERSION}" MATROSKASPLITTER
+
+    !ifdef INST_TYPE
+        SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE} RO
+    !else
+        SectionIn 1 RO
+    !endif
+   
+    IfFileExists "$INSTDIR\${MATROSKASPLITTER_FILE}" 0 lblAfterMATROSKASPLITTER
+    UnRegDLL "$INSTDIR\${MATROSKASPLITTER_FILE}.ax"
+    Delete "$INSTDIR\${MATROSKASPLITTER_FILE}.ax"
+
+    lblAfterMATROSKASPLITTER:
+
+    StrCmp $WINDOWSVERSION "UnicodeVersion" lblUnicodeVersion
+
+    File /oname=${MATROSKASPLITTER_FILE}.ax "${COMPONENTSDIR}\guliverkli\${MATROSKASPLITTER_FILE}_normal.ax"
+    Goto lblAfterFile
+
+    lblUnicodeVersion:
+    File /oname=${MATROSKASPLITTER_FILE}.ax "${COMPONENTSDIR}\guliverkli\${MATROSKASPLITTER_FILE}_unicode.ax"
+
+    lblAfterFile:
+    RegDLL "$INSTDIR\${MATROSKASPLITTER_FILE}.ax"
+
+SectionEnd
+;--------------------------------

Added: trunk/MatroskaPack/Include/sections/MMSWITCH.nsh
===================================================================
--- trunk/MatroskaPack/Include/sections/MMSWITCH.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/sections/MMSWITCH.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,72 @@
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+; Name:   Matroska Pack
+; File:   Section MMSwitch.nsh
+; Date:   2004/08/16
+; Autor:  nibor
+; NSIS:   NSIS 2.0
+; Desc:   Section of component MMSwitch
+;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;installer sections
+
+;--------------------------------
+Section "${MMSWITCH_NAME} ${MMSWITCH_VERSION}" MMSWITCH
+
+    !ifdef INST_TYPE
+        SectionIn ${INST_TYPE_FULL}
+    !endif
+
+    IfFileExists "$INSTDIR\MMSwitch\${MMSWITCH_NAME}.ax" 0 lblAfterMMSWITCH
+    UnRegDLL "$INSTDIR\MMSwitch\${MMSWITCH_NAME}.ax"
+    UnRegDLL "$INSTDIR\MMSwitch\${MMSWITCH_NAME}.dll"
+    RMDir /r "$INSTDIR\MMSwitch"
+   
+    lblAfterMMSWITCH:
+    File /r "${COMPONENTSDIR}\MMSwitch"
+    RegDLL "$INSTDIR\MMSwitch\${MMSWITCH_FILE}.ax"
+    RegDLL "$INSTDIR\MMSwitch\${MMSWITCH_FILE}.dll"
+   
+SectionEnd
+;--------------------------------
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;functions
+
+Function MMSwitchUninstallQuestionPre
+
+    IntOp $MMSWITCH_UNINSTALL -1 +
+
+FunctionEnd
+
+Function MMSwitchUninstallQuestion
+
+    IntCmp $MMSWITCH_UNINSTALL -1 0 lblMMSwitchUninstallQuestionEnd lblMMSwitchUninstallQuestionEnd
+
+    SectionGetFlags ${MMSWITCH} $R0
+    ; 0x00000001 -> SF_SELECTED
+    IntOp $R1 $R0 & 0x00000001
+    IntCmp $R1 0x00000001 lblMMSwitchUninstallQuestionEnd
+    
+    IfFileExists "$INSTDIR\MMSwitch\${MMSWITCH_NAME}.ax" 0 lblMMSwitchUninstallQuestionEnd
+
+    MessageBox MB_YESNO|MB_ICONQUESTION "\
+    We have found the MMSwitch filter installed.${CRLF}\
+    This filter is only needed when using simple players, like Windows Media Player, in combination with Matroska files containing multiple audio streams. \
+    More advanced players do not need this filter. \
+    Therefore we recommend that you use a better player and uninstall the filter.${CRLF}${CRLF}\
+    Do you want to remove the MMSwitch filter?" IDNO lblNotRemoveMMSwitch
+
+        IntOp $MMSWITCH_UNINSTALL 1 +
+        GoTo lblMMSwitchUninstallQuestionEnd
+    
+    lblNotRemoveMMSwitch:
+    
+        IntOp $MMSWITCH_UNINSTALL 0 +
+
+
+    lblMMSwitchUninstallQuestionEnd:
+
+FunctionEnd

Added: trunk/MatroskaPack/Include/sections/REALMEDIASPLITTER.nsh
===================================================================
--- trunk/MatroskaPack/Include/sections/REALMEDIASPLITTER.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/sections/REALMEDIASPLITTER.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,41 @@
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+; Name:   Matroska Pack
+; File:   Section REALMEDIASPLITTER.nsh
+; Date:   2004/08/12
+; Autor:  nibor
+; NSIS:   NSIS 2.0
+; Desc:   Section of component RealMediaSplitter
+;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;Installer Sections
+
+;--------------------------------
+Section "${REALMEDIASPLITTER_NAME} ${REALMEDIASPLITTER_VERSION}" REALMEDIASPLITTER
+
+    !ifdef INST_TYPE
+        SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+    !endif
+
+    IfFileExists "$INSTDIR\${REALMEDIASPLITTER_FILE}.ax" 0 lblAfterREALMEDIASPLITTER
+    UnRegDLL "$INSTDIR\${REALMEDIASPLITTER_FILE}.ax"
+    Delete "$INSTDIR\${REALMEDIASPLITTER_FILE}.ax"
+   
+    lblAfterREALMEDIASPLITTER:
+
+    StrCmp $WINDOWSVERSION "UnicodeVersion" lblUnicodeVersion
+
+    File /oname=${REALMEDIASPLITTER_FILE}.ax "${COMPONENTSDIR}\guliverkli\${REALMEDIASPLITTER_FILE}_normal.ax"
+    Goto lblAfterFile
+
+    lblUnicodeVersion:
+    File /oname=${REALMEDIASPLITTER_FILE}.ax "${COMPONENTSDIR}\guliverkli\${REALMEDIASPLITTER_FILE}_unicode.ax"
+
+    lblAfterFile:
+    RegDLL "$INSTDIR\${REALMEDIASPLITTER_FILE}.ax"
+    
+    StrCpy $REALMEDIASPLITTER_INSTALLED "true"
+
+SectionEnd
+;--------------------------------

Added: trunk/MatroskaPack/Include/sections/TTA.nsh
===================================================================
--- trunk/MatroskaPack/Include/sections/TTA.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/sections/TTA.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,39 @@
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+; Name:   Matroska Pack
+; File:   Section TTA.nsh
+; Date:   2004/08/12
+; Autor:  nibor
+; NSIS:   NSIS 2.0
+; Desc:   Section of component TTA
+;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;Installer Sections
+
+;--------------------------------
+Section "${TTA_NAME} ${TTA_VERSION}" TTA
+
+    !ifdef INST_TYPE
+        SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+    !endif
+    
+    IfFileExists "$INSTDIR\TTADSSplitter.ax" 0 +3
+        UnRegDLL "$INSTDIR\TTADSSplitter.ax"
+          Delete "$INSTDIR\TTADSSplitter.ax"
+    IfFileExists "$INSTDIR\TTADSDecoder.ax" 0 +3
+        UnRegDLL "$INSTDIR\TTADSDecoder.ax"
+          Delete "$INSTDIR\TTADSDecoder.ax"
+    IfFileExists "$INSTDIR\TTADSEncoder.ax" 0 +3
+        UnRegDLL "$INSTDIR\TTADSEncoder.ax"
+          Delete "$INSTDIR\TTADSEncoder.ax"
+
+    File "${COMPONENTSDIR}\TTA\TTADSSplitter.ax"
+    File "${COMPONENTSDIR}\TTA\TTADSDecoder.ax"
+    File "${COMPONENTSDIR}\TTA\TTADSEncoder.ax"
+    RegDLL "$INSTDIR\TTADSSplitter.ax"
+    RegDLL "$INSTDIR\TTADSDecoder.ax"
+    RegDLL "$INSTDIR\TTADSEncoder.ax"
+   
+SectionEnd
+;--------------------------------

Added: trunk/MatroskaPack/Include/sections/VSFILTER.nsh
===================================================================
--- trunk/MatroskaPack/Include/sections/VSFILTER.nsh	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Include/sections/VSFILTER.nsh	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,39 @@
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+; Name:   Matroska Pack
+; File:   Section VSFILTER.nsh
+; Date:   2004/08/12
+; Autor:  nibor
+; NSIS:   NSIS 2.0
+; Desc:   Section of component VSFilter
+;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;Installer Sections
+
+;--------------------------------
+Section "${VSFILTER_NAME} ${VSFILTER_VERSION}" VSFILTER
+
+    !ifdef INST_TYPE
+        SectionIn ${INST_TYPE_FULL} ${INST_TYPE_SAFE}
+    !endif
+
+    IfFileExists "$INSTDIR\${VSFILTER_NAME}.dll" 0 lblAfterVSFILTER
+    UnRegDLL "$INSTDIR\${VSFILTER_NAME}.dll"
+    Delete "$INSTDIR\${VSFILTER_NAME}.dll"
+   
+    lblAfterVSFILTER:
+
+    StrCmp $WINDOWSVERSION "UnicodeVersion" lblUnicodeVersion
+
+    File /oname=${VSFILTER_FILE}.dll "${COMPONENTSDIR}\guliverkli\${VSFILTER_FILE}_normal.dll"
+    Goto lblAfterFile
+
+    lblUnicodeVersion:
+    File /oname=${VSFILTER_FILE}.dll "${COMPONENTSDIR}\guliverkli\${VSFILTER_FILE}_unicode.dll"
+
+    lblAfterFile:
+    RegDLL "$INSTDIR\${VSFILTER_FILE}.dll"
+
+SectionEnd
+;--------------------------------

Modified: trunk/MatroskaPack/Lite/Matroska Pack Lite.nsi
===================================================================
--- trunk/MatroskaPack/Lite/Matroska Pack Lite.nsi	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Lite/Matroska Pack Lite.nsi	2004-08-21 22:02:46 UTC (rev 723)
@@ -1,114 +1,118 @@
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 ; Name:   Matroska Pack Lite
 ; File:   Matroska Pack Lite.nsi
-; Date:   2004/03/27
-; Autor:  Nibor
+; Date:   2004/08/21
+; Autor:  nibor
 ; NSIS:   NSIS 2.0
 ; Desc:   Lite pack with only the most used components
 ;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Include Modern UI
+;first commands
 
-  !include "MUI.nsh"
+    !include "MUI.nsh"
+    SetCompressor lzma
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;General Defines
+;general defines
 
-   !define VERSION "1.0.2"
-   !define VERSIONDATE "2004-03-27"
-   !define NAME "Matroska Pack"
-   !define PACK "Lite"
-   !define FILE "Matroska_Pack_${PACK}_v${VERSION}"
+    !define VERSION "1.0.3"
+    !define VERSIONDATE "2004-08-21"
+    !define NAME "Matroska Pack"
+    !define PACK "Lite"
+    !define FILE "Matroska_Pack_${PACK}_v${VERSION}"
 
-   !define MAINDIR ".."
-   !define COMPONENTSDIR "${MAINDIR}\Components"
-   !define INCLUDEDIR "${MAINDIR}\Include"
-
-   !include "${INCLUDEDIR}\Component Defines.nsh"
+    !define MAINDIR ".."
+    !define COMPONENTSDIR "${MAINDIR}\components"
+    !define INCLUDEDIR "${MAINDIR}\include"
+    !define FUNCTIONSDIR "${INCLUDEDIR}\functions"
+    !define SECTIONSDIR "${INCLUDEDIR}\sections"
    
-   Var WINDOWSVERSION
-   Var STARTMENU_FOLDER
-   
+    Var WINDOWSVERSION
+    Var STARTMENU_FOLDER
 
+
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Configuration
+;general includes
 
-   SetCompressor lzma
+    !include "${INCLUDEDIR}\Component Defines.nsh"
+    !include "${FUNCTIONSDIR}\WindowsVersion.nsh"
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;configuration
    
-   Name "${NAME} ${PACK} v${VERSION}"
-   Outfile "${MAINDIR}\bin\${FILE}.exe"
+    Name "${NAME} ${PACK} v${VERSION}"
+    Outfile "${MAINDIR}\bin\${FILE}.exe"
    
-   InstallDir "$PROGRAMFILES\${NAME}"
-   InstallDirRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}" "InstallLocation"
+    InstallDir "$PROGRAMFILES\${NAME}"
+    InstallDirRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}" "InstallLocation"
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Interface Settings
+;interface settings
 
-   !include "${INCLUDEDIR}\Interface Settings.nsh"
+    !include "${INCLUDEDIR}\Interface Settings.nsh"
    
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Pages
+;pages
 
-   !include "${INCLUDEDIR}\Page Defines.nsh"
+    !include "${INCLUDEDIR}\Page Defines.nsh"
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Languages
+;languages
 
-   !insertmacro MUI_LANGUAGE "English"
+    !insertmacro MUI_LANGUAGE "English"
 
-   ;Descriptions
-   !include "${INCLUDEDIR}\Description Language Strings.nsh"
+    # descriptions
+    !include "${INCLUDEDIR}\Description Language Strings.nsh"
 
    
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Design Options
+;design options
 
-   ;Version Information requires MUI_LANGUAGE or LoadLanguageFile
-   !include "${INCLUDEDIR}\Version Information.nsh"
-   !include "${INCLUDEDIR}\Design Options.nsh"
+    # Version Information requires MUI_LANGUAGE or LoadLanguageFile
+    !include "${INCLUDEDIR}\Version Information.nsh"
+    !include "${INCLUDEDIR}\Design Options.nsh"
    
    
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Reserve Files
+;reserve files
 
-   ReserveFile "${MAINDIR}\GNU General Public License.txt"
-;   ReserveFile "Matroska.bmp"
+    !include "${INCLUDEDIR}\Reserve Files.nsh"
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Installer Sections
+;installer sections
 
-!include "${INCLUDEDIR}\Section - Begin.nsh"
+!include "${SECTIONSDIR}\- Begin.nsh"
 
-!include "${INCLUDEDIR}\Section MATROSKASPLITTER.nsh"
-!include "${INCLUDEDIR}\Section MATROSKAMUXER.nsh"
+!include "${SECTIONSDIR}\MATROSKASPLITTER.nsh"
+!include "${SECTIONSDIR}\MATROSKAMUXER.nsh"
 
-!include "${INCLUDEDIR}\Section VSFILTER.nsh"
+!include "${SECTIONSDIR}\VSFILTER.nsh"
 
-!include "${INCLUDEDIR}\Section COREVORBIS.nsh"
+!include "${SECTIONSDIR}\COREVORBIS.nsh"
    
-!include "${INCLUDEDIR}\Section - End.nsh"
+!include "${SECTIONSDIR}\- End.nsh"
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Descriptions
+;descriptions
 
-   !include "${INCLUDEDIR}\Description Inserts.nsh"
+    !include "${INCLUDEDIR}\Description Inserts.nsh"
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Functions
+;functions
 
-!include "${INCLUDEDIR}\WindowsVersion Functions.nsh"
-
 Function .onInit
 
-   Call GetWindowsNormalOrUnicode
+    Call GetWindowsNormalOrUnicode
 
 FunctionEnd
+

Modified: trunk/MatroskaPack/Lite/ReadMe Matroska Pack Lite.nsi
===================================================================
--- trunk/MatroskaPack/Lite/ReadMe Matroska Pack Lite.nsi	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Lite/ReadMe Matroska Pack Lite.nsi	2004-08-21 22:02:46 UTC (rev 723)
@@ -1,83 +1,67 @@
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 ; Name:   ReadMe Matroska Pack Lite
 ; File:   ReadMe Matroska Pack Lite.nsi
-; Date:   2004/03/27
-; Autor:  Nibor
+; Date:   2004/08/21
+; Autor:  nibor
 ; NSIS:   NSIS 2.0
 ; Desc:   Small app to create the ReadMe.html
 ;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Include Modern UI
+;first commands
 
-  !include "MUI.nsh"
+    !include "MUI.nsh"
+    SetCompressor bzip2
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;General Defines
+;general defines
 
-   !define VERSION "1.0.2"
-   !define VERSIONDATE "2004-03-27"
-   !define NAME "Matroska Pack"
-   !define PACK "Lite"
-   !define FILE "ReadMe_Matroska_Pack_${PACK}_v${VERSION}"
-   
-   !define READMEFILE "$EXEDIR\ReadMe.html"
+    !define VERSION "1.0.3"
+    !define VERSIONDATE "2004-08-21"
+    !define NAME "Matroska Pack"
+    !define PACK "Lite"
+    !define FILE "ReadMe_Matroska_Pack_${PACK}_v${VERSION}"
 
-   !define MAINDIR ".."
-   !define COMPONENTSDIR "${MAINDIR}\Components"
-   !define INCLUDEDIR "${MAINDIR}\Include"
-   !define READMEDIR "${MAINDIR}\ReadMe"
+    !define READMEFILE "$EXEDIR\ReadMe.html"
 
-   !include "${INCLUDEDIR}\Component Defines.nsh"
-   !include "${INCLUDEDIR}\ReadMe Macros.nsh"
-   
-   Var WINDOWSVERSION
-   Var STARTMENU_FOLDER
-   
+    !define MAINDIR ".."
+    !define COMPONENTSDIR "${MAINDIR}\Components"
+    !define INCLUDEDIR "${MAINDIR}\Include"
+    !define FUNCTIONSDIR "${INCLUDEDIR}\functions"
+    !define READMEDIR "${MAINDIR}\ReadMe"
 
+
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Configuration
+;general includes
 
-   SetCompressor bzip2
-   
-   Name "${NAME} ${PACK} ReadMe v${VERSION}"
-   Outfile "${FILE}.exe"
-   
-   InstallDir "$EXEDIR"
+    !include "${INCLUDEDIR}\Component Defines.nsh"
+    !include "${FUNCTIONSDIR}\ReadMe.nsh"
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Interface Settings
+;configuration
 
-   !define MUI_INSTFILESPAGE_PROGRESSBAR smooth
-   !define MUI_INSTFILESPAGE_FINISHHEADER_TEXT "Completed. Visit www.matroska.org for latest matroska release info!"
-   
+    Name "${NAME} ${PACK} ReadMe v${VERSION}"
+    Outfile "${FILE}.exe"
+    InstallDir "$EXEDIR"
 
-;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Pages
 
-   !insertmacro MUI_PAGE_INSTFILES
-
-   !insertmacro MUI_UNPAGE_DIRECTORY
-   !insertmacro MUI_UNPAGE_INSTFILES
-
-
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Languages
+;pages
 
-   !insertmacro MUI_LANGUAGE "English"
+    !insertmacro MUI_PAGE_INSTFILES
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Design Options
+;languages
 
-   !include "${INCLUDEDIR}\Design Options.nsh"
+    !insertmacro MUI_LANGUAGE "English"
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Installer Sections
+;installer sections
 
 ;--------------------------------
 Section -
@@ -102,7 +86,3 @@
 SectionEnd
 ;--------------------------------
 
-
-
-
-

Modified: trunk/MatroskaPack/Lite/ReadMe.html
===================================================================
--- trunk/MatroskaPack/Lite/ReadMe.html	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Lite/ReadMe.html	2004-08-21 22:02:46 UTC (rev 723)
@@ -6,27 +6,23 @@
 <title>Matroska Pack</title>
 <style type="text/css">
 <!--
+p { font-size:small; }
+a { font-weight:bold; color:#888888; text-decoration:underline }
+a:hover { font-weight:bold; color:#000000; text-decoration:underline }
 th { font-size:small; text-align:left; padding-right:20px; }
 td { font-size:small; padding-right:20px; }
-p { font-size:small; font-weight:normal; }
-a:link { font-weight:bold; color:#888888; text-decoration:underline }
-a:visited { font-weight:bold; color:#888888; text-decoration:underline }
-a:hover { font-weight:bold; color:#000000; text-decoration:underline }
-a:active { font-weight:bold; color:#888888; text-decoration:underline }
-a:focus	{ font-weight:bold; color:#888888; text-decoration:underline }
 -->
 </style>
 </head>
 
 <body style="font-family:Verdana">
-<h3>Matroska Pack Lite v1.0.2</h3>
+<h3>Matroska Pack Lite v1.0.3</h3>
 <p>The Matroska Pack contains many programs (mainly DirectShow filters) to playback Matroska files.</p>
 <p>Visit <a href="http://www.matroska.org">www.matroska.org</a> if you want to know more about Matroska.</p>
 <p>See <a href="http://packs.matroska.org">packs.matroska.org</a> for updates and information about the Matroska Packs.</p>
 <br>
 <table border="0">
 <tr>
-	<!--<td colspan="4" style="font-size:medium;"><h4>The Matroska Pack Full v1.0.1 contains:</h4></td>-->
 	<th colspan="4">This pack contains:</th>
 </tr>
 <tr>
@@ -42,22 +38,22 @@
 
 <tr>
 <td><a href="http://sourceforge.net/projects/guliverkli/">MatroskaSplitter</a></td>
-<td>v1.0.2.3</td>
-<td>2004-03-11</td>
+<td>v1.0.2.4</td>
+<td>2004-08-16</td>
 <td>Normal and Unicode version</td>
 </tr>
 
 <tr>
 <td><a href="http://sourceforge.net/projects/guliverkli/">MatroskaMuxer</a></td>
-<td>v1.0.0.8</td>
-<td>2003-12-20</td>
+<td>v1.0.0.9</td>
+<td>2004-08-21</td>
 <td></td>
 </tr>
 
 <tr>
 <td><a href="http://sourceforge.net/projects/guliverkli/">VSFilter</a></td>
 <td>v2.33</td>
-<td>2004-03-08</td>
+<td>2004-08-13</td>
 <td>Normal and Unicode version</td>
 </tr>
 
@@ -73,7 +69,10 @@
 </tr>
 
 </table>
-<p>e-mail to: <b>nibor at matroska.org</b></p>
+<p>
+e-mail to: <b>nibor at matroska.org</b><br />
+IRC: <a href="irc://irc.corecodec.com:6667/#matroska">irc.corecodec.com:6667/#matroska</a>
+</p>
 </body>
 
 </html>

Deleted: trunk/MatroskaPack/Lite/ReadMe_original.html

Added: trunk/MatroskaPack/MMSwitch question.txt
===================================================================
--- trunk/MatroskaPack/MMSwitch question.txt	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/MMSwitch question.txt	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1 @@
+"We have found the MMSwitch filter installed.  This filter was part of an earlier version of this pack and is only needed when using simple players, like Windows Media Player, in combination with Matroska files containing multiple audio streams.  More advanced players do not need this filter.  Therefore we recommend that you use a better player and uninstall the filter now.  Do you want to remove the <insert filter name here> filter now?"
\ No newline at end of file

Modified: trunk/MatroskaPack/MPEG4/Matroska Pack MPEG4.nsi
===================================================================
--- trunk/MatroskaPack/MPEG4/Matroska Pack MPEG4.nsi	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/MPEG4/Matroska Pack MPEG4.nsi	2004-08-21 22:02:46 UTC (rev 723)
@@ -1,133 +1,138 @@
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 ; Name:   Matroska Pack MPEG4
 ; File:   Matroska Pack MPEG4.nsi
-; Date:   2004/03/27
-; Autor:  Nibor
+; Date:   2004/08/21
+; Autor:  nibor
 ; NSIS:   NSIS 2.0
 ; Desc:   MPEG4 pack with standard + MPEG4 components
 ;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Include Modern UI
+;first commands
 
-  !include "MUI.nsh"
+    !include "MUI.nsh"
+    SetCompressor lzma
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;General Defines
+;general defines
 
-   !define VERSION "1.0.2"
-   !define VERSIONDATE "2004-03-27"
-   !define NAME "Matroska Pack"
-   !define PACK "MPEG4"
-   !define FILE "Matroska_Pack_${PACK}_v${VERSION}"
+    !define VERSION "1.0.3"
+    !define VERSIONDATE "2004-08-21"
+    !define NAME "Matroska Pack"
+    !define PACK "MPEG4"
+    !define FILE "Matroska_Pack_${PACK}_v${VERSION}"
 
-   !define MAINDIR ".."
-   !define COMPONENTSDIR "${MAINDIR}\Components"
-   !define INCLUDEDIR "${MAINDIR}\Include"
-
-   !include "${INCLUDEDIR}\Component Defines.nsh"
+    !define MAINDIR ".."
+    !define COMPONENTSDIR "${MAINDIR}\Components"
+    !define INCLUDEDIR "${MAINDIR}\Include"
    
-   Var WINDOWSVERSION
-   Var STARTMENU_FOLDER
-   !define MMSWITCH_CUSTOM
-   Var MMSWITCH_UNINSTALL
+    !define FUNCTIONSDIR "${INCLUDEDIR}\functions"
+    !define SECTIONSDIR "${INCLUDEDIR}\sections"
    
+    Var WINDOWSVERSION
+    Var STARTMENU_FOLDER
+    !define MMSWITCH_CUSTOM
+    Var MMSWITCH_UNINSTALL
+   
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Configuration
+;general includes
 
-   SetCompressor lzma
+    !include "${INCLUDEDIR}\Component Defines.nsh"
+    !include "${FUNCTIONSDIR}\WindowsVersion.nsh"
+
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;configuration
+
+    Name "${NAME} ${PACK} v${VERSION}"
+    Outfile "${MAINDIR}\bin\${FILE}.exe"
    
-   Name "${NAME} ${PACK} v${VERSION}"
-   Outfile "${MAINDIR}\bin\${FILE}.exe"
-   
-   InstallDir "$PROGRAMFILES\${NAME}"
-   InstallDirRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}" "InstallLocation"
+    InstallDir "$PROGRAMFILES\${NAME}"
+    InstallDirRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}" "InstallLocation"
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Interface Settings
+;interface settings
 
-   !include "${INCLUDEDIR}\Interface Settings.nsh"
+    !include "${INCLUDEDIR}\Interface Settings.nsh"
    
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Pages
+;pages
 
-   !include "${INCLUDEDIR}\Page Defines.nsh"
+    !include "${INCLUDEDIR}\Page Defines.nsh"
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Languages
+;languages
 
-   !insertmacro MUI_LANGUAGE "English"
+    !insertmacro MUI_LANGUAGE "English"
 
-   ;Descriptions
-   !include "${INCLUDEDIR}\Description Language Strings.nsh"
+    # descriptions
+    !include "${INCLUDEDIR}\Description Language Strings.nsh"
 
    
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Design Options
+;design options
 
-   ;Version Information requires MUI_LANGUAGE or LoadLanguageFile
-   !include "${INCLUDEDIR}\Version Information.nsh"
-   !include "${INCLUDEDIR}\Design Options.nsh"
+    # Version Information requires MUI_LANGUAGE or LoadLanguageFile
+    !include "${INCLUDEDIR}\Version Information.nsh"
+    !include "${INCLUDEDIR}\Design Options.nsh"
    
    
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Reserve Files
+;reserve files
 
-   ReserveFile "${MAINDIR}\GNU General Public License.txt"
-;   ReserveFile "Matroska.bmp"
+    !include "${INCLUDEDIR}\Reserve Files.nsh"
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Installer Sections
+;installer sections
 
-; Set the install types
+# set the install types
 !include "${INCLUDEDIR}\InstType Defines.nsh"
 
-!include "${INCLUDEDIR}\Section - Begin.nsh"
+!include "${SECTIONSDIR}\- Begin.nsh"
 
-!include "${INCLUDEDIR}\Section MATROSKASPLITTER.nsh"
-!include "${INCLUDEDIR}\Section MATROSKAMUXER.nsh"
+!include "${SECTIONSDIR}\MATROSKASPLITTER.nsh"
+!include "${SECTIONSDIR}\MATROSKAMUXER.nsh"
 
-!include "${INCLUDEDIR}\Section VSFILTER.nsh"
+!include "${SECTIONSDIR}\VSFILTER.nsh"
 
-!include "${INCLUDEDIR}\Section MMSWITCH.nsh"
+!include "${SECTIONSDIR}\MMSWITCH.nsh"
 
 SubSection "Audio Filters" AUDIOFILTERS
-   !include "${INCLUDEDIR}\Section COREAAC.nsh"
-   !include "${INCLUDEDIR}\Section COREVORBIS.nsh"
-   !include "${INCLUDEDIR}\Section MATRIXMIXER.nsh"
+    !include "${SECTIONSDIR}\COREAAC.nsh"
+    !include "${SECTIONSDIR}\COREVORBIS.nsh"
+    !include "${SECTIONSDIR}\MATRIXMIXER.nsh"
 SubSectionEnd
    
-!include "${INCLUDEDIR}\Section FFDSHOW.nsh"
+!include "${SECTIONSDIR}\FFDSHOW.nsh"
    
-!include "${INCLUDEDIR}\Section - End.nsh"
+!include "${SECTIONSDIR}\- End.nsh"
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Descriptions
+;descriptions
 
-   !include "${INCLUDEDIR}\Description Inserts.nsh"
+    !include "${INCLUDEDIR}\Description Inserts.nsh"
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Functions
-
-!include "${INCLUDEDIR}\WindowsVersion Functions.nsh"
+;functions
    
 Function .onSelChange
 
-   Call CheckFFDSHOW
+    Call CheckFFDSHOW
 
 FunctionEnd
 
 Function .onInit
 
-   Call GetWindowsNormalOrUnicode
+    Call GetWindowsNormalOrUnicode
 
 FunctionEnd
+

Modified: trunk/MatroskaPack/MPEG4/ReadMe Matroska Pack MPEG4.nsi
===================================================================
--- trunk/MatroskaPack/MPEG4/ReadMe Matroska Pack MPEG4.nsi	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/MPEG4/ReadMe Matroska Pack MPEG4.nsi	2004-08-21 22:02:46 UTC (rev 723)
@@ -1,84 +1,68 @@
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 ; Name:   ReadMe Matroska Pack MPEG4
 ; File:   ReadMe Matroska Pack MPEG4.nsi
-; Date:   2004/03/27
-; Autor:  Nibor
+; Date:   2004/08/21
+; Autor:  nibor
 ; NSIS:   NSIS 2.0
 ; Desc:   Small app to create the ReadMe.html
 ;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Include Modern UI
+;first commands
 
-  !include "MUI.nsh"
+    !include "MUI.nsh"
+    SetCompressor bzip2
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;General Defines
+;general defines
 
-   !define VERSION "1.0.2"
-   !define VERSIONDATE "2004-03-27"
-   !define NAME "Matroska Pack"
-   !define PACK "MPEG4"
-   !define FILE "ReadMe_Matroska_Pack_${PACK}_v${VERSION}"
-   
-   !define READMEFILE "$EXEDIR\ReadMe.html"
+    !define VERSION "1.0.3"
+    !define VERSIONDATE "2004-08-21"
+    !define NAME "Matroska Pack"
+    !define PACK "MPEG4"
+    !define FILE "ReadMe_Matroska_Pack_${PACK}_v${VERSION}"
 
-   !define MAINDIR ".."
-   !define COMPONENTSDIR "${MAINDIR}\Components"
-   !define INCLUDEDIR "${MAINDIR}\Include"
-   !define READMEDIR "${MAINDIR}\ReadMe"
+    !define READMEFILE "$EXEDIR\ReadMe.html"
 
-   !include "${INCLUDEDIR}\Component Defines.nsh"
-   !include "${INCLUDEDIR}\ReadMe Macros.nsh"
-   
-   Var WINDOWSVERSION
-   Var STARTMENU_FOLDER
-   
+    !define MAINDIR ".."
+    !define COMPONENTSDIR "${MAINDIR}\Components"
+    !define INCLUDEDIR "${MAINDIR}\Include"
+    !define FUNCTIONSDIR "${INCLUDEDIR}\functions"
+    !define READMEDIR "${MAINDIR}\ReadMe"
 
+
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Configuration
+;general includes
 
-   SetCompressor bzip2
-   
-   Name "${NAME} ${PACK} ReadMe v${VERSION}"
-   Outfile "${FILE}.exe"
-   
-   InstallDir "$EXEDIR"
+    !include "${INCLUDEDIR}\Component Defines.nsh"
+    !include "${FUNCTIONSDIR}\ReadMe.nsh"
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Interface Settings
+;configuration
 
-   !define MUI_INSTFILESPAGE_PROGRESSBAR smooth
-   !define MUI_INSTFILESPAGE_FINISHHEADER_TEXT "Completed. Visit www.matroska.org for latest matroska release info!"
-   
+    Name "${NAME} ${PACK} ReadMe v${VERSION}"
+    Outfile "${FILE}.exe"
+    InstallDir "$EXEDIR"
 
+
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Pages
+;pages
 
    !insertmacro MUI_PAGE_INSTFILES
 
-   !insertmacro MUI_UNPAGE_DIRECTORY
-   !insertmacro MUI_UNPAGE_INSTFILES
 
-
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Languages
+;languages
 
    !insertmacro MUI_LANGUAGE "English"
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Design Options
+;installer sections
 
-   !include "${INCLUDEDIR}\Design Options.nsh"
-
-
-;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Installer Sections
-
 ;--------------------------------
 Section -
 
@@ -100,13 +84,9 @@
         !insertmacro WRITE_README_COMPONENT $R0 "MATRIXMIXER"
         !insertmacro WRITE_README_COMPONENT $R0 "FFDSHOW"
     !insertmacro CLOSE_FILE $R0
-    
+
     !insertmacro APPEND_FILES "${READMEFILE}" "${READMEDIR}\4_body_end.txt" "${READMEFILE}"
 
 SectionEnd
 ;--------------------------------
 
-
-
-
-

Modified: trunk/MatroskaPack/MPEG4/ReadMe.html
===================================================================
--- trunk/MatroskaPack/MPEG4/ReadMe.html	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/MPEG4/ReadMe.html	2004-08-21 22:02:46 UTC (rev 723)
@@ -6,27 +6,23 @@
 <title>Matroska Pack</title>
 <style type="text/css">
 <!--
+p { font-size:small; }
+a { font-weight:bold; color:#888888; text-decoration:underline }
+a:hover { font-weight:bold; color:#000000; text-decoration:underline }
 th { font-size:small; text-align:left; padding-right:20px; }
 td { font-size:small; padding-right:20px; }
-p { font-size:small; font-weight:normal; }
-a:link { font-weight:bold; color:#888888; text-decoration:underline }
-a:visited { font-weight:bold; color:#888888; text-decoration:underline }
-a:hover { font-weight:bold; color:#000000; text-decoration:underline }
-a:active { font-weight:bold; color:#888888; text-decoration:underline }
-a:focus	{ font-weight:bold; color:#888888; text-decoration:underline }
 -->
 </style>
 </head>
 
 <body style="font-family:Verdana">
-<h3>Matroska Pack MPEG4 v1.0.2</h3>
+<h3>Matroska Pack MPEG4 v1.0.3</h3>
 <p>The Matroska Pack contains many programs (mainly DirectShow filters) to playback Matroska files.</p>
 <p>Visit <a href="http://www.matroska.org">www.matroska.org</a> if you want to know more about Matroska.</p>
 <p>See <a href="http://packs.matroska.org">packs.matroska.org</a> for updates and information about the Matroska Packs.</p>
 <br>
 <table border="0">
 <tr>
-	<!--<td colspan="4" style="font-size:medium;"><h4>The Matroska Pack Full v1.0.1 contains:</h4></td>-->
 	<th colspan="4">This pack contains:</th>
 </tr>
 <tr>
@@ -42,22 +38,22 @@
 
 <tr>
 <td><a href="http://sourceforge.net/projects/guliverkli/">MatroskaSplitter</a></td>
-<td>v1.0.2.3</td>
-<td>2004-03-11</td>
+<td>v1.0.2.4</td>
+<td>2004-08-16</td>
 <td>Normal and Unicode version</td>
 </tr>
 
 <tr>
 <td><a href="http://sourceforge.net/projects/guliverkli/">MatroskaMuxer</a></td>
-<td>v1.0.0.8</td>
-<td>2003-12-20</td>
+<td>v1.0.0.9</td>
+<td>2004-08-21</td>
 <td></td>
 </tr>
 
 <tr>
 <td><a href="http://sourceforge.net/projects/guliverkli/">VSFilter</a></td>
 <td>v2.33</td>
-<td>2004-03-08</td>
+<td>2004-08-13</td>
 <td>Normal and Unicode version</td>
 </tr>
 
@@ -71,7 +67,7 @@
 <tr>
 <td><a href="http://coreaac.corecodec.org/">CoreAAC</a></td>
 <td>v1.0b9</td>
-<td>2004-03-12</td>
+<td>2004-07-09</td>
 <td>Binary on <a href="http://www.rarewares.org/aac.html">Rarewares AAC section</a></td>
 </tr>
 
@@ -91,8 +87,8 @@
 
 <tr>
 <td><a href="http://sourceforge.net/projects/ffdshow/">ffdshow</a></td>
-<td>2003-05-23</td>
-<td>2003-05-23</td>
+<td>2004-08-21 (decoding only)</td>
+<td>2004-08-21</td>
 <td></td>
 </tr>
 
@@ -101,7 +97,10 @@
 </tr>
 
 </table>
-<p>e-mail to: <b>nibor at matroska.org</b></p>
+<p>
+e-mail to: <b>nibor at matroska.org</b><br />
+IRC: <a href="irc://irc.corecodec.com:6667/#matroska">irc.corecodec.com:6667/#matroska</a>
+</p>
 </body>
 
 </html>

Deleted: trunk/MatroskaPack/MPEG4/ReadMe_original.html

Modified: trunk/MatroskaPack/ReadMe/4_body_end.txt
===================================================================
--- trunk/MatroskaPack/ReadMe/4_body_end.txt	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/ReadMe/4_body_end.txt	2004-08-21 22:02:46 UTC (rev 723)
@@ -4,7 +4,10 @@
 </tr>
 
 </table>
-<p>e-mail to: <b>nibor at matroska.org</b></p>
+<p>
+e-mail to: <b>nibor at matroska.org</b><br />
+IRC: <a href="irc://irc.corecodec.com:6667/#matroska">irc.corecodec.com:6667/#matroska</a>
+</p>
 </body>
 
 </html>

Added: trunk/MatroskaPack/Real-disclaimer.txt
===================================================================
--- trunk/MatroskaPack/Real-disclaimer.txt	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Real-disclaimer.txt	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,7 @@
+[15:47] <ChrisHJW> WARNING !!
+[15:50] <ChrisHJW> We have received many support requests from users trying to play MKV files with Realvideo 9 ( RV9 / RV10 / RV40 ) content. These files will NOT play after installing the matroska full pack, they require the DLLs from RealNetworks to be present on your system. This is normally achieved by installing Realplayer from http://www.realnetowrks.com ( Please refer to http://forum.doom9.org on how to install RealOne 'safely', means in the least agress
+[15:50] <ChrisHJW> s/they require/they also require
+
+Please note:
+We have received many support requests from users trying to play MKV files with RealVideo ( RV9/RV10/RV40 ) content. These files will NOT play on your current setup, you need to have the DLLs from Real installed. Since they are not free to distribute, we can't provide them in this pack.
+Select how you want to proceed:

Modified: trunk/MatroskaPack/Uninstaller/Matroska Pack Uninstaller.nsi
===================================================================
--- trunk/MatroskaPack/Uninstaller/Matroska Pack Uninstaller.nsi	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/Uninstaller/Matroska Pack Uninstaller.nsi	2004-08-21 22:02:46 UTC (rev 723)
@@ -1,8 +1,8 @@
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 ; Name:   Matroska Pack Uninstaller
 ; File:   Matroska Pack Uninstaller.nsi
-; Date:   2004/03/27
-; Autor:  Nibor
+; Date:   2004/08/21
+; Autor:  nibor
 ; NSIS:   NSIS 2.0
 ; Desc:   Installer file for generating the
 ;         'Uninstall.exe' for _all_ the Editions
@@ -11,16 +11,17 @@
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Include Modern UI
+;first commands
 
     !include "MUI.nsh"
-  
+    SetCompressor lzma
 
+
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;General Defines
+;general defines
 
-    !define VERSION "1.0.2"
-    !define VERSIONDATE "2004-03-27"
+    !define VERSION "1.0.3"
+    !define VERSIONDATE "2004-08-21"
     !define NAME "Matroska Pack"
     !define PACK "Uninstaller"
     !define FILE "Matroska_Pack_${PACK}_${VERSIONDATE}"
@@ -29,26 +30,35 @@
     !define COMPONENTSDIR "${MAINDIR}\Components"
     !define INCLUDEDIR "${MAINDIR}\Include"
 
-    !include "${INCLUDEDIR}\Component Defines.nsh"
-   
     Var STARTMENU_FOLDER
     Var MATROSKAPROP_UNINSTALLER
 
-   
+
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Configuration
+;general includes
 
-    SetCompressor lzma
+    !include "${INCLUDEDIR}\Component Defines.nsh"
 
+
+;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+;configuration
+
     Name "${NAME}"
     Outfile "${FILE}.exe"
-
     InstallDir "$EXEDIR"
-   
 
+
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Interface Settings
+;interface settings
 
+    !define MUI_HEADERIMAGE
+    !define MUI_HEADERIMAGE_BITMAP "${MAINDIR}\images\logo_72x57.bmp"
+    !define MUI_HEADERIMAGE_BITMAP_NOSTRETCH
+    !define MUI_HEADERIMAGE_UNBITMAP "${MAINDIR}\images\logo_72x57.bmp"
+    !define MUI_HEADERIMAGE_UNBITMAP_NOSTRETCH
+    !define MUI_HEADERIMAGE_RIGHT
+    !define MUI_UI_HEADERIMAGE_RIGHT "${MAINDIR}\images\modern_headerbmpr.exe"
+
     !define MUI_INSTFILESPAGE_PROGRESSBAR smooth
    
     !define MUI_FINISHPAGE_NOREBOOTSUPPORT
@@ -62,7 +72,7 @@
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Pages
+;pages
 
     !insertmacro MUI_PAGE_INSTFILES
 
@@ -70,28 +80,28 @@
     !insertmacro MUI_UNPAGE_INSTFILES
 
     !define MUI_PAGE_CUSTOMFUNCTION_PRE un.UnPageCustomPre
-    !insertmacro   MUI_UNPAGE_FINISH
+    !insertmacro MUI_UNPAGE_FINISH
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Languages
+;languages
 
     !insertmacro MUI_LANGUAGE "English"
-   
 
+
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Design Options
+;design options
 
     !include "${INCLUDEDIR}\Design Options.nsh"
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Installer Sections
+;installer sections
 
 ;--------------------------------
 Section -
 
-    WriteUninstaller "$INSTDIR\Uninstall_${VERSIONDATE}.exe"
+    WriteUninstaller "$INSTDIR\uninstall_${VERSIONDATE}.exe"
 
 SectionEnd
 ;--------------------------------
@@ -99,77 +109,74 @@
 ;--------------------------------
 Section "Uninstall"
 
-    IfFileExists "$INSTDIR\${MATROSKASPLITTER_FILE}" 0 lblAfterMATROSKASPLITTER
+    IfFileExists "$INSTDIR\${MATROSKASPLITTER_FILE}" 0 +3
     UnRegDLL "$INSTDIR\${MATROSKASPLITTER_FILE}.ax"
     Delete "$INSTDIR\${MATROSKASPLITTER_FILE}.ax"
-    lblAfterMATROSKASPLITTER:
    
-    IfFileExists "$INSTDIR\${TIMESTAMPMANAGER_FILE}" 0 lblAfterTIMESTAMPMANAGER
+    IfFileExists "$INSTDIR\${TIMESTAMPMANAGER_FILE}" 0 +3
     UnRegDLL "$INSTDIR\${TIMESTAMPMANAGER_FILE}"
     Delete "$INSTDIR\${TIMESTAMPMANAGER_FILE}"
-    lblAfterTIMESTAMPMANAGER:
 
-    IfFileExists "$INSTDIR\${MATROSKAMUXER_FILE}" 0 lblAfterMATROSKAMUXER
+    IfFileExists "$INSTDIR\${MATROSKAMUXER_FILE}" 0 +3
     UnRegDLL "$INSTDIR\${MATROSKAMUXER_FILE}"
     Delete "$INSTDIR\${MATROSKAMUXER_FILE}"
-    lblAfterMATROSKAMUXER:
 
-    IfFileExists "$INSTDIR\${VSFILTER_NAME}.dll" 0 lblAfterVSFILTER
+    IfFileExists "$INSTDIR\${VSFILTER_NAME}.dll" 0 +3
     UnRegDLL "$INSTDIR\${VSFILTER_NAME}.dll"
     Delete "$INSTDIR\${VSFILTER_NAME}.dll"
-    lblAfterVSFILTER:
    
-    IfFileExists "$INSTDIR\${MMSWITCH_NAME}.ax" 0 lblAfterMMSWITCH
+    IfFileExists "$INSTDIR\${MMSWITCH_NAME}.ax" 0 +4
     UnRegDLL "$INSTDIR\${MMSWITCH_NAME}.ax"
     UnRegDLL "$INSTDIR\${MMSWITCH_NAME}.dll"
     RMDir /r "$INSTDIR\MMSwitch"
-    lblAfterMMSWITCH:
 
-    IfFileExists "$INSTDIR\${COREAAC_FILE}" 0 lblAfterCOREAAC
+    IfFileExists "$INSTDIR\${COREAAC_FILE}" 0 +3
     UnRegDLL "$INSTDIR\${COREAAC_FILE}"
     Delete "$INSTDIR\${COREAAC_FILE}"
-    lblAfterCOREAAC:
 
-    IfFileExists "$INSTDIR\${COREVORBIS_FILE}" 0 lblAfterCOREVORBIS
+    IfFileExists "$INSTDIR\${COREVORBIS_FILE}" 0 +3
     UnRegDLL "$INSTDIR\${COREVORBIS_FILE}"
     Delete "$INSTDIR\${COREVORBIS_FILE}"
-    lblAfterCOREVORBIS:
    
-    IfFileExists "$INSTDIR\${COREFLACDECODER_FILE}" 0 lblAfterCOREFLACDECODER
+    IfFileExists "$INSTDIR\${COREFLACDECODER_FILE}" 0 +3
     UnRegDLL "$INSTDIR\${COREFLACDECODER_FILE}"
     Delete "$INSTDIR\${COREFLACDECODER_FILE}"
-    lblAfterCOREFLACDECODER:
+    
+    IfFileExists "$INSTDIR\TTADSSplitter.ax" 0 +3
+        UnRegDLL "$INSTDIR\TTADSSplitter.ax"
+          Delete "$INSTDIR\TTADSSplitter.ax"
+    IfFileExists "$INSTDIR\TTADSDecoder.ax" 0 +3
+        UnRegDLL "$INSTDIR\TTADSDecoder.ax"
+          Delete "$INSTDIR\TTADSDecoder.ax"
+    IfFileExists "$INSTDIR\TTADSEncoder.ax" 0 +3
+        UnRegDLL "$INSTDIR\TTADSEncoder.ax"
+          Delete "$INSTDIR\TTADSEncoder.ax"
 
-    IfFileExists "$INSTDIR\AC3Filter\${AC3FILTER_FILE}" 0 lblAfterAC3FILTER
+    IfFileExists "$INSTDIR\AC3Filter\${AC3FILTER_FILE}" 0 +3
     UnRegDLL "$INSTDIR\AC3Filter\${AC3FILTER_FILE}"
     RMDir /r "$INSTDIR\AC3Filter"
-    lblAfterAC3FILTER:
 
-    IfFileExists "$INSTDIR\MatrixMixer\${MATRIXMIXER_FILE}" 0 lblAfterMATRIXMIXER
+    IfFileExists "$INSTDIR\MatrixMixer\${MATRIXMIXER_FILE}" 0 +3
     UnRegDLL "$INSTDIR\MatrixMixer\${MATRIXMIXER_FILE}"
     RMDir /r "$INSTDIR\MatrixMixer"
-    lblAfterMATRIXMIXER:
 
-    IfFileExists "$INSTDIR\${REALMEDIASPLITTER_FILE}.ax" 0 lblAfterREALMEDIASPLITTER
+    IfFileExists "$INSTDIR\${REALMEDIASPLITTER_FILE}.ax" 0 +3
     UnRegDLL "$INSTDIR\${REALMEDIASPLITTER_FILE}.ax"
     Delete "$INSTDIR\${REALMEDIASPLITTER_FILE}.ax"
-    lblAfterREALMEDIASPLITTER:
 
-    IfFileExists "$INSTDIR\ffdshow\ffdshow.ax" 0 lblAfterFFDSHOW
+    IfFileExists "$INSTDIR\ffdshow\ffdshow.ax" 0 +4
     UnRegDLL "$INSTDIR\ffdshow\ffdshow.ax"
     RMDir /r "$INSTDIR\ffdshow"
     DeleteRegKey HKLM "SOFTWARE\GNU\ffdshow"
-    lblAfterFFDSHOW:
 
     Delete "$INSTDIR\GNU General Public License.rtf"
     Delete "$INSTDIR\ReadMe.html"
     Delete "$INSTDIR\Disclaimer.html"
-;   Delete "$INSTDIR\Matroska.ico"
+    Delete "$INSTDIR\matroska.ico"
 
     ReadRegStr $STARTMENU_FOLDER HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}" "StartmenuFolder"
-    StrCmp $STARTMENU_FOLDER "" lblAfterStartMenu
+    StrCmp $STARTMENU_FOLDER "" +2
     RMDir /r "$SMPROGRAMS\$STARTMENU_FOLDER"
-    lblAfterStartMenu:
 
     Delete "$INSTDIR\Uninstall.exe"
 
@@ -177,20 +184,13 @@
 
     DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}"
 
-    ;Display the Finish header
-;   !insertmacro MUI_UNFINISHHEADER
-
-   ;MUI_INSTFILESPAGE_FINISHHEADER_TEXT text
-;Text to display on the header of the installation page when the installation has been completed (won't be displayed when using a Finish page without MUI_(UN)FINISHPAGE_NOAUTOCLOSE).
-
 SectionEnd
 ;--------------------------------
 
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-;Functions
+;functions
 
-
 Function un.RunMatroskaPropUninstaller
 
     Exec "$MATROSKAPROP_UNINSTALLER"
@@ -199,11 +199,8 @@
 
 Function un.UnPageCustomPre
 
-    StrCmp $MATROSKAPROP_UNINSTALLER "" +1 lblEndUnPageCustomPre
-    
+    StrCmp $MATROSKAPROP_UNINSTALLER "" 0 +2
     DeleteINISec "$PLUGINSDIR\ioSpecial.ini" "Field 4"
-    
-    lblEndUnPageCustomPre:
 
 FunctionEnd
 
@@ -234,3 +231,4 @@
     Call un.CheckIfMatroskaPropUninstaller
 
 FunctionEnd
+

Added: trunk/MatroskaPack/Uninstaller/Matroska_Pack_Uninstaller_2004-08-21.exe
===================================================================
(Binary files differ)


Property changes on: trunk/MatroskaPack/Uninstaller/Matroska_Pack_Uninstaller_2004-08-21.exe
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/MatroskaPack/Uninstaller/uninstall_2004-08-21.exe
===================================================================
(Binary files differ)


Property changes on: trunk/MatroskaPack/Uninstaller/uninstall_2004-08-21.exe
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/MatroskaPack/UserGuide.html
===================================================================
--- trunk/MatroskaPack/UserGuide.html	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/UserGuide.html	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,178 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/transitional.dtd">
+<html>
+<head>
+<title>Matroska</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<style type="text/css">
+<!--
+body {
+	font-family: Verdana, Sans-serif;
+	font-size: small;
+	background: #FFF;
+	color: #000;
+}
+
+table {
+	border: 1px solid #BBB;
+	font-size: small;
+}
+
+td {
+	color: #000;
+	background: #EEE;
+	padding: 4px;
+}
+
+a:link {
+	font-weight: bold;
+	color: #004488;	
+}
+
+a:visited {
+	font-weight: bold;
+	color: #004488;
+}
+
+a:hover {
+	color: #2288CC;
+	background: #EEE;
+}
+
+h1 {
+	text-align: center;
+	font: xx-large sans-serif;
+}
+
+-->
+</style>
+</head>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr>
+    <td width="642"><h1><strong><font size="+3" face="Arial, Helvetica, sans-serif"><em><font size="+4">User Guide / Disclaimer</font></em> for the installation of the <em><font size="+4">matroska</font></em> 
+        filter playback packs</font></strong></h1>
+    </td>
+  </tr>
+  <tr>
+    <td valign="top" style="padding: 30px 30px 30px 30px;"><p><br />
+        In principle you can play <strong><em>matroska</em></strong> files on 
+        almost every Mediaplayer on Windows if you install this <a href="http://packs.matroska.org">playback 
+        pack</a>, as most of these players are based on Microsoft DirectShow (TM). 
+        Examples for these basic players, relying on DirectShow only, are 
+      <p>Windows Mediaplayer 6.4/7/8/9<br />
+        BSPlayer<br />
+        Radlight Player<br />
+        Winamp 3<br />
+        <br />
+        This installer pack was very well tested on many different computers and 
+        setups, and was proven to work fine for most of the testers. However, 
+        we have been informed that the pack has caused problems on the machines 
+        of some users, maybe caused by incompatibilities with other installed 
+        filters, especially if so-called 'codec packs' were installed before. 
+        Microsoft's DirectShow can be tricky sometimes, so please understand our 
+        warning in this respect. For this very reason, we can't take any responsibility 
+        for this kind of incompatibilities, nor can we accept any compensation 
+        claims if the installation of the playback pack leads to problems on your 
+        machine. If you have doubts here, try to use Xine or VLC ( see links below 
+        ).
+      <p><font size="+2"><strong><br />
+        Players with advanced Matroska support :</strong></font>
+      <p>Meanwhile there are several very good players who can make more than 
+        just support basic playback of <strong><em>matroska</em></strong> files 
+        on Windows, but also offer specific support for the more advanced features 
+        of it, like 
+      <p>- switching of audio streams without the need for 3rd party filters like 
+        Morgan Stream Switcher ( it can be installed as an option here with this 
+        pack, but can cause problems in combination with other filters )<br />
+        - automatic Aspect Ratio Correction for anamorphically encoded movies<br />
+        - Reading/Writing matroska tags<br>
+        etc.
+      <p><a href="http://www.corecoded.com"><strong>The Core Media Player</strong></a>
+      <p>The Core Media Team are great supporters of <strong><em>matroska</em></strong> 
+        , and they invested a lot of time to help one of our team members, Jory 
+        'Jcsston' Stone, to add specific <strong><em>matroska</em></strong> support 
+        with a so-called <a href="http://cdl.matroska.org">CDL plugin</a>. Of 
+        course, its coming with a built in audio stream switcher.
+      <p>Using this plugin the users can currently<br />
+        - read/write all the available tags in matroska audio and video files, 
+        such as title, artist, creation date, etc.<br />
+        - automatically correct the display aspect ratio depending on the values 
+        stored in the video track header, for anamorphic encodings ( like DVDs, 
+        SVCDs )<br />
+        and there are are even more functions planned for the future. 
+      <p><br>
+        <a href="http://sourceforge.net/projects/guliverkli/"><strong>Media Player 
+        Classic</strong></a>
+      <p>Gabest, the subtitles wizzard, has made a Mediaplayer of his own based 
+        on DirectShow also, and he recently added <strong><em>matroska</em></strong> 
+        support to it with a self made <a href="http://sourceforge.net/project/showfiles.php?group_id=82303&amp;package_id=84361">DirectShow 
+        parser filter</a> that will work on all other players named above also, 
+        but does allow a few specific functions in conjunction with his <a href="http://sourceforge.net/project/showfiles.php?group_id=82303&amp;package_id=84358">player</a>, 
+        like switching audio streams, etc..
+      <p><br />
+        <a href="http://www.videolan.org"><strong>VLC ( Videolan )</strong></a>
+      <p>It was a big honour when Fenrir from the Videolan team added matroska 
+        support to this player, and more or less over a ( looong ) night. VLC 
+        has great streaming possibilities, as it can act as a streaming server 
+        also, and is not based on DirectShow. Because of that, it doesn't need 
+        installation of any other filters or codecs, as its coming with support 
+        for the mostly used video and audio formats already built in. We strongly 
+        recommend this player if you don't want to mess with installation of any 
+        codec packs or the like, just to be able to play a matroska file a friend 
+        has sent to you ;-).<br />
+      
+      <p><a href="http://www.inmatrix.com"><strong>Zoomplayer</strong></a> 
+      <p>Blight, who made his hobby a profession and is coding this player for 
+        his living, recently added specific matroska support to his player ( since 
+        ver. 3.30 ), using the possibilities that the newest matroska splitter 
+        filter offers via a special, extended 'track info interface', created 
+        by Toff from the CorePlayer team. His player now supports AR correction, 
+        and has a built in audio stream switcher. Zoomplayer is DirectShow based, 
+        like TCMP.<br />
+      <p><a href="http://xinehq.de/"><strong>Xine</strong></a>
+      <p>This great Linux player has matroska support meanwhile, thanks to the 
+        hard work of thibaut, and is available as a Windows compile also.
+      <p><br />
+        <a href="http://www.foobar2000.org/"><strong>Foobar2000</strong></a>
+      <p>Peter Pawlowski, a former member of the winamp development team, has 
+        created his own audio player project, and already a huge group of fans 
+        meanwhile. His player has support for almost all existing audio compression 
+        formats, can transcode from one audio format to another, and was one of 
+        the first apps that supported the new matroska tagging system.<br />
+      
+      <p> <strong><font size="+1">Additional Information for this installer pack 
+        :<br>
+        </font></strong> 
+      <p><strong><em>matroska</em></strong> files can contain a big number of 
+        different audio and video compression formats. We are trying to list the 
+        most used formats here, and also give links to the necessary decoder filters 
+        you have to install to be able to view your movies :
+      <p><strong>DivX Video :</strong> The installer will enable this via <a href="http://sf.net/projects/ffdshow">FFDshow</a>, 
+        a great opensource project for a free MPEG4 decoder filter. 
+      <p><strong>XviD Video :</strong> Same as for DivX Video. 
+      <p><strong>AAC Audio :</strong> This great new audio compression standard 
+        is covered with an opensource decoder filter called <a href="http://corecodec.org/projects/coreaac">CoreAAC</a>
+      <p><strong>Ogg Vorbis audio</strong> : The Xiphophorus people gave a great 
+        free and patent free audio compression standard, called Ogg Vorbis. Vorbis 
+        audio can be stored fine in <strong><em>matroska</em></strong> files, 
+        and for playback we install the great <a href="http://corecodec.org/projects/corevorbis">CoreVorbis</a> 
+        decoder filter
+      <p><strong>Multichannel ( 5.1 surround ) audio :</strong> Both AAC and Vorbis 
+        audio can be true 5.1 Digital surround also. The two decoder filters mentioned 
+        above can play this fine, but need some help if you don't have a 5.1 capable 
+        soundcard. The installer will add the great matrix filter to allow automatic 
+        downmixing for Stereo cards.
+      <p><strong>General sidenote about playback of audio and video in<em> matroska 
+        </em>files :</strong> 
+      <p>Thanks to the so-called 'Video For Windows' ( VfW ) compatibility mode 
+        of <strong><em>matroska</em></strong> it is possible to store and play 
+        every VfW video codec in it, and the same is valid for ACM audio codecs 
+        ( only CBR ). Just install the codec on your Windows PC, and VirtualdubMod 
+        will be able to open any AVI video using this codec and mux it into a 
+        .mkv file. For playback the normal VCM decoder, or DirectShow decoder 
+        filter will be used from the <strong><em>matroska</em></strong> DirectShow 
+        parser.</p></td>
+  </tr>
+</table>
+</body>
+</html>
+

Added: trunk/MatroskaPack/UserGuide.rtf
===================================================================
--- trunk/MatroskaPack/UserGuide.rtf	2004-08-21 20:19:20 UTC (rev 722)
+++ trunk/MatroskaPack/UserGuide.rtf	2004-08-21 22:02:46 UTC (rev 723)
@@ -0,0 +1,51 @@
+{\rtf1\ansi\ansicpg1252\deff0\deftab709{\fonttbl{\f0\fnil\fcharset0 Arial;}{\f1\froman\fprq2\fcharset0 Times New Roman;}{\f2\fswiss\fprq2\fcharset0 Verdana;}}
+{\colortbl ;\red0\green0\blue0;}
+\viewkind4\uc1\pard\ri-22\lang1033\b\fs32 Disclaimer / User Guide\cf1\b0\f1\fs24\par
+\line\f2\fs18 In principle you can play \cf0\i matroska\cf1\i0  files on almost every Mediaplayer on Windows if you install this \b playback pack <http://packs.matroska.org/>\b0 , as most of these players are based on Microsoft DirectShow (TM). Examples for these basic players, relying on DirectShow only, are\par
+\fs12\par
+\fs18 - Windows Mediaplayer 6.4/7/8/9\line - BSPlayer\line - Radlight Player\line - Winamp 3\line\line This installer pack was very well tested on many different computers and setups, and was proven to work fine for most of the testers. However, we have been informed that the pack has caused problems on the machines of some users, maybe caused by incompatibilities with other installed filters, especially if so-called 'codec packs' were installed before. Microsoft's DirectShow can be tricky sometimes, so please understand our warning in this respect. For this very reason, we can't take any responsibility for this kind of incompatibilities, nor can we accept any compensation claims if the installation of the playback pack leads to problems on your machine. If you have doubts here, try to use Xine or VLC ( see links below ). \par
+\cf0\b\par
+\line\fs22 Players with advanced Matroska support :\cf1\b0\par
+\fs12\par
+\fs18 Meanwhile there are several very good players who can make more than just support basic playback of \cf0\i matroska\cf1\i0  files on Windows, but also offer specific support for the more advanced features of it, like\par
+\fs12\par
+\fs18 - switching of audio streams without the need for 3rd party filters like Morgan Stream Switcher ( it can be installed as an option here with this pack, but can cause problems in combination with other filters )\par
+\fs12\par
+\fs18 - automatic Aspect Ratio Correction for anamorphically encoded movies\par
+\fs12\par
+\fs18 - Reading/Writing matroska tags\line\par
+\b The Core Media Player <http://www.corecoded.com/>\b0\par
+The Core Media Team are great supporters of \cf0\i matroska\cf1\i0  , and they invested a lot of time to help one of our team members, Jory 'Jcsston' Stone, to add specific \cf0\i matroska\cf1\i0  support with a so-called CDL plugin <http://cdl.matroska.org/>. Of course, its coming with a built in audio stream switcher. \par
+Using this plugin the users can currently\line - read/write all the available tags in matroska audio and video files, such as title, artist, creation date, etc.\line - automatically correct the display aspect ratio depending on the values stored in the video track header, for anamorphic encodings ( like DVDs, SVCDs )\line and there are are even more functions planned for the future. \par
+\line\b Media Player Classic <http://sourceforge.net/projects/guliverkli/>\b0\par
+Gabest, the subtitles wizzard, has made a Mediaplayer of his own based on DirectShow also, and he recently added \cf0\i matroska\cf1\i0  support to it with a self made DirectShow parser filter <http://sourceforge.net/project/showfiles.php?group_id=82303&package_id=84361> that will work on all other players named above also, but does allow a few specific functions in conjunction with his player <http://sourceforge.net/project/showfiles.php?group_id=82303&package_id=84358>, like switching audio streams, etc.. \par
+\line\b VLC ( Videolan ) <http://www.videolan.org/>\par
+\b0 It was a big honour when Fenrir from the Videolan team added matroska support to this player, and more or less over a ( looong ) night. VLC has great streaming possibilities, as it can act as a streaming server also, and is not based on DirectShow. Because of that, it doesn't need installation of any other filters or codecs, as its coming with support for the mostly used video and audio formats already built in. We strongly recommend this player if you don't want to mess with installation of any codec packs or the like, just to be able to play a matroska file a friend has sent to you ;-).\par
+\par
+\b Zoomplayer <http://www.inmatrix.com/>\b0\par
+Blight, who made his hobby a profession and is coding this player for his living, recently added specific matroska support to his player ( since ver. 3.30 ), using the possibilities that the newest matroska splitter filter offers via a special, extended 'track info interface', created by Toff from the CorePlayer team. His player now supports AR correction, and has a built in audio stream switcher. Zoomplayer is DirectShow based, like TCMP.\par
+\par
+\b Xine <http://xinehq.de/>\b0\par
+This great Linux player has matroska support meanwhile, thanks to the hard work of thibaut, and is available as a Windows compile also. \par
+\line\b Foobar2000 <http://www.foobar2000.org/>\b0\par
+Peter Pawlowski, a former member of the winamp development team, has created his own audio player project, and already a huge group of fans meanwhile. His player has support for almost all existing audio compression formats, can transcode from one audio format to another, and was one of the first apps that supported the new matroska tagging system.\par
+\cf0\b\par
+\par
+\fs22 Additional Information for this installer pack :\par
+\cf1\b0\fs12\par
+\cf0\i\fs18 matroska\cf1\i0  files can contain a big number of different audio and video compression formats. We are trying to list the most used formats here, and also give links to the necessary decoder filters you have to install to be able to view your movies : \par
+\cf0\b\par
+DivX Video :\cf1\b0  The installer will enable this via FFDshow <http://sf.net/projects/ffdshow>, a great opensource project for a free MPEG4 decoder filter. \par
+\cf0\b\par
+XviD Video :\cf1\b0  Same as for DivX Video. \par
+\cf0\b\par
+AAC Audio :\cf1\b0  This great new audio compression standard is covered with an opensource decoder filter called CoreAAC <http://corecodec.org/projects/coreaac> \par
+\cf0\b\par
+Ogg Vorbis audio\cf1\b0  : The Xiphophorus people gave a great free and patent free audio compression standard, called Ogg Vorbis. Vorbis audio can be stored fine in \cf0\i matroska\cf1\i0  files, and for playback we install the great CoreVorbis <http://corecodec.org/projects/corevorbis> decoder filter \par
+\cf0\b\par
+Multichannel ( 5.1 surround ) audio :\cf1\b0  Both AAC and Vorbis audio can be true 5.1 Digital surround also. The two decoder filters mentioned above can play this fine, but need some help if you don't have a 5.1 capable soundcard. The installer will add the great matrix filter to allow automatic downmixing for Stereo cards. \par
+\cf0\b\par
+General sidenote about playback of audio and video in\i  matroska \i0 files :\cf1\b0  \par
+Thanks to the so-called 'Video For Windows' ( VfW ) compatibility mode of \cf0\i matroska\cf1\i0  it is possible to store and play every VfW video codec in it, and the same is valid for ACM audio codecs ( only CBR ). Just install the codec on your Windows PC, and VirtualdubMod will be able to open any AVI video using this codec and mux it into a .mkv file. For playback the normal VCM decoder, or DirectShow decoder filter will be used from the \cf0\i matroska\cf1\i0  DirectShow parser.\par
+}
+
\ No newline at end of file

Deleted: trunk/MatroskaPack/bin/Disclaimer.html

Deleted: trunk/MatroskaPack/bin/Matroska_Pack_Full_v1.0.2_ReadMe.html

Deleted: trunk/MatroskaPack/bin/Matroska_Pack_Lite_v1.0.2_ReadMe.html

Deleted: trunk/MatroskaPack/bin/Matroska_Pack_MPEG4_v1.0.2_ReadMe.html

Deleted: trunk/MatroskaPack/bin/Matroska_Pack_content.html

Deleted: trunk/MatroskaPack/bin/index.html

Added: trunk/MatroskaPack/images/logo_72x57.bmp
===================================================================
(Binary files differ)


Property changes on: trunk/MatroskaPack/images/logo_72x57.bmp
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/MatroskaPack/images/matroska.ico
===================================================================
(Binary files differ)


Property changes on: trunk/MatroskaPack/images/matroska.ico
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/MatroskaPack/images/modern_headerbmp.exe
===================================================================
(Binary files differ)


Property changes on: trunk/MatroskaPack/images/modern_headerbmp.exe
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/MatroskaPack/images/modern_headerbmpr.exe
===================================================================
(Binary files differ)


Property changes on: trunk/MatroskaPack/images/modern_headerbmpr.exe
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.