XBMC Media Center

Revision: 12112
          http://xbmc.svn.sourceforge.net/xbmc/?rev=12112&view=rev
Author:   spiff_
Date:     2008-03-15 12:20:25 -0700 (Sat, 15 Mar 2008)

Log Message:
-----------
added: adplug codec for linux

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/paplayer/DllAdplug.h

Added Paths:
-----------
    branches/linuxport/XBMC/system/players/paplayer/adplug-i486-linux.so
    branches/linuxport/sources/paplayer/AdplugCodec/
    branches/linuxport/sources/paplayer/AdplugCodec/AdplugXBMC.cpp
    branches/linuxport/sources/paplayer/AdplugCodec/README
    branches/linuxport/sources/paplayer/AdplugCodec/xbmc.diff

Removed Paths:
-------------
    branches/linuxport/docs/Adplug.rar

Added: branches/linuxport/XBMC/system/players/paplayer/adplug-i486-linux.so
===================================================================
(Binary files differ)


Property changes on: branches/linuxport/XBMC/system/players/paplayer/adplug-i486-linux.so
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/DllAdplug.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/DllAdplug.h	2008-03-15 19:04:36 UTC (rev 12111)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/DllAdplug.h	2008-03-15 19:20:25 UTC (rev 12112)
@@ -17,7 +17,11 @@
 
 class DllAdplug : public DllDynamic, DllAdplugInterface
 {
+#ifdef _LINUX
+  DECLARE_DLL_WRAPPER(DllAdplug, q:\\system\\players\\paplayer\\adplug-i486-linux.so)
+#else
   DECLARE_DLL_WRAPPER(DllAdplug, q:\\system\\players\\paplayer\\adplug.dll)
+#endif
   DEFINE_METHOD0(int, Init)
   DEFINE_METHOD1(int, LoadADL, (const char* p1))
   DEFINE_METHOD1(void, FreeADL, (int p1))

Deleted: branches/linuxport/docs/Adplug.rar
===================================================================
(Binary files differ)

Added: branches/linuxport/sources/paplayer/AdplugCodec/AdplugXBMC.cpp
===================================================================
--- branches/linuxport/sources/paplayer/AdplugCodec/AdplugXBMC.cpp	                        (rev 0)
+++ branches/linuxport/sources/paplayer/AdplugCodec/AdplugXBMC.cpp	2008-03-15 19:20:25 UTC (rev 12112)
@@ -0,0 +1,110 @@
+#include "adplug.h"
+#include "emuopl.h"
+
+struct ADLSong
+{
+  CPlayer* player;
+  CEmuopl* opl;
+  char* szBuf;
+  char* szStartOfBuf;
+  int bufLen;
+};
+
+#ifdef __linux__
+#define __declspec(dllexport)
+#endif
+
+extern "C"
+{
+  int __declspec(dllexport) DLL_Init()
+  {
+    return 1;
+  }
+
+  int __declspec(dllexport) DLL_LoadADL(const char* szFileName)
+  {
+    ADLSong* result = new ADLSong;
+    result->opl = new CEmuopl(48000,true,true);
+    result->opl->init();
+    if (result->player = CAdPlug::factory(szFileName,result->opl))
+    {
+      result->bufLen = 48000/result->player->getrefresh()*4;
+      result->szBuf = new char[result->bufLen];
+      result->szStartOfBuf = result->szBuf;
+      return (int)result;
+    }
+
+    return NULL;
+  }
+
+  void __declspec(dllexport) DLL_FreeADL(int adl)
+  {
+    ADLSong* song = (ADLSong*)adl;
+    delete song->player;
+    delete song->opl;
+    delete song->szBuf;
+    delete song;
+  }
+
+  int __declspec(dllexport) DLL_FillBuffer(int adl, char* szBuffer, int iSize)
+  {
+    ADLSong* song = (ADLSong*)adl;    
+    int iCurrSize = iSize;
+    while (iCurrSize > 0)
+    {
+      if (song->szStartOfBuf >= song->szBuf+song->bufLen)
+      {
+        if (!song->player->update())
+          return -1;
+          
+        song->opl->update((short*)song->szBuf,song->bufLen/4);
+        song->szStartOfBuf = song->szBuf;
+      }
+      int iCopy=0;
+      if (iCurrSize > song->szBuf+song->bufLen-song->szStartOfBuf)
+        iCopy = song->szBuf+song->bufLen-song->szStartOfBuf;
+      else
+        iCopy = iCurrSize;
+
+      memcpy(szBuffer,song->szStartOfBuf,iCopy);
+      szBuffer += iCopy;
+      iCurrSize -= iCopy;
+      song->szStartOfBuf += iCopy;
+    }
+
+    return iSize-iCurrSize;
+  }
+
+  unsigned long __declspec(dllexport) DLL_Seek(int adl, unsigned long iTimePos)
+  {
+     ADLSong* song = (ADLSong*)adl;
+     song->player->rewind();
+     song->player->seek(iTimePos); 
+     song->szStartOfBuf = song->szBuf+song->bufLen;
+
+     return iTimePos;
+  }
+
+  const char __declspec(dllexport) *DLL_GetTitle(int adl)
+  {
+     ADLSong* song = (ADLSong*)adl;
+
+     printf("title %s",song->player->gettitle());
+     return song->player->gettitle();
+  }
+
+  const char __declspec(dllexport) *DLL_GetArtist(int adl)
+  {
+     ADLSong* song = (ADLSong*)adl;
+
+     printf("artist %s",song->player->getauthor());
+     return (const char*)song->player->getauthor();
+  }
+
+  unsigned long __declspec(dllexport) DLL_GetLength(int adl)
+  {
+    ADLSong* song = (ADLSong*)adl;
+
+    return song->player->songlength();
+  }
+}

Added: branches/linuxport/sources/paplayer/AdplugCodec/README
===================================================================
--- branches/linuxport/sources/paplayer/AdplugCodec/README	                        (rev 0)
+++ branches/linuxport/sources/paplayer/AdplugCodec/README	2008-03-15 19:20:25 UTC (rev 12112)
@@ -0,0 +1,9 @@
+To build the codec 
+1) grab newest version of library from http://adplug.sourceforge.net/
+2) apply xbmc.diff
+3) copy AdplugXBMC.cpp to src/
+3) ensure static linking to libbinio by setting libbinio_LIBS in configure
+4) make
+5) you will now have your library in src/.libs
+
+current svn is based on v2.1

Added: branches/linuxport/sources/paplayer/AdplugCodec/xbmc.diff
===================================================================
--- branches/linuxport/sources/paplayer/AdplugCodec/xbmc.diff	                        (rev 0)
+++ branches/linuxport/sources/paplayer/AdplugCodec/xbmc.diff	2008-03-15 19:20:25 UTC (rev 12112)
@@ -0,0 +1,48 @@
+--- ../adplug-2.1-orig/src/Makefile.in	2007-04-08 18:58:13.000000000 +0200
++++ src/Makefile.in	2008-03-15 19:56:42.000000000 +0100
+@@ -63,7 +63,7 @@
+ 	s3m.lo dtm.lo fmc.lo mtk.lo rad.lo raw.lo sa2.lo xad.lo \
+ 	flash.lo bmf.lo hybrid.lo hyp.lo psi.lo rat.lo u6m.lo rol.lo \
+ 	xsm.lo adlibemu.lo dro.lo lds.lo realopl.lo analopl.lo \
+-	temuopl.lo msc.lo rix.lo adl.lo
++	temuopl.lo msc.lo rix.lo adl.lo AdplugXBMC.lo
+ libadplug_la_OBJECTS = $(am_libadplug_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -81,7 +81,7 @@
+ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-CXXLD = $(CXX)
++CXXLD = $(CXX) `cat ../../../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.def` ../../../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.o
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libadplug_la_SOURCES)
+@@ -206,7 +206,7 @@
+ hsp.cpp ksm.cpp mad.cpp mid.cpp mkj.cpp cff.cpp dmo.cpp s3m.cpp dtm.cpp \
+ fmc.cpp mtk.cpp rad.cpp raw.cpp sa2.cpp xad.cpp flash.cpp bmf.cpp hybrid.cpp \
+ hyp.cpp psi.cpp rat.cpp u6m.cpp rol.cpp mididata.h xsm.cpp adlibemu.c dro.cpp \
+-lds.cpp realopl.cpp analopl.cpp temuopl.cpp msc.cpp rix.cpp adl.cpp
++lds.cpp realopl.cpp analopl.cpp temuopl.cpp msc.cpp rix.cpp adl.cpp AdplugXBMC.cpp
+ 
+ libadplug_la_LDFLAGS = -release @VERSION@ -version-info 0 $(libbinio_LIBS)
+ 
+@@ -344,6 +344,7 @@
+ @AMDEP_TRUE@...@ @am__quote@...@
+ @AMDEP_TRUE@...@ @am__quote@...@
+ @AMDEP_TRUE@...@ @am__quote@...@
++@AMDEP_TRUE@...@ @am__quote@...@
+ 
+ .c.o:
+ @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+--- ../adplug-2.1-orig/src/Makefile.am	2006-05-15 15:49:35.000000000 +0200
++++ src/Makefile.am	2008-03-15 19:20:52.000000000 +0100
+@@ -6,7 +6,7 @@
+ hsp.cpp ksm.cpp mad.cpp mid.cpp mkj.cpp cff.cpp dmo.cpp s3m.cpp dtm.cpp \
+ fmc.cpp mtk.cpp rad.cpp raw.cpp sa2.cpp xad.cpp flash.cpp bmf.cpp hybrid.cpp \
+ hyp.cpp psi.cpp rat.cpp u6m.cpp rol.cpp mididata.h xsm.cpp adlibemu.c dro.cpp \
+-lds.cpp realopl.cpp analopl.cpp temuopl.cpp msc.cpp rix.cpp adl.cpp
++lds.cpp realopl.cpp analopl.cpp temuopl.cpp msc.cpp rix.cpp adl.cpp AdplugXBMC.cpp
+ 
+ libadplug_la_LDFLAGS = -release @VERSION@ -version-info 0 $(libbinio_LIBS)
+ 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12121
          http://xbmc.svn.sourceforge.net/xbmc/?rev=12121&view=rev
Author:   spiff_
Date:     2008-03-15 19:15:54 -0700 (Sat, 15 Mar 2008)

Log Message:
-----------
changed: moved waveform and spectrum code to sources/ and unified win32/linux

Added Paths:
-----------
    branches/linuxport/sources/visualisations/OpenGLSpectrum/
    branches/linuxport/sources/visualisations/OpenGLSpectrum/Makefile
    branches/linuxport/sources/visualisations/OpenGLSpectrum/opengl_spectrum.cpp
    branches/linuxport/sources/visualisations/OpenGLSpectrum/opengl_spectrum.h
    branches/linuxport/sources/visualisations/OpenGLSpectrum/opengl_spectrum.sln
    branches/linuxport/sources/visualisations/OpenGLSpectrum/opengl_spectrum.vcproj
    branches/linuxport/sources/visualisations/WaveForm/
    branches/linuxport/sources/visualisations/WaveForm/Main.cpp
    branches/linuxport/sources/visualisations/WaveForm/Makefile
    branches/linuxport/sources/visualisations/WaveForm/Waveform.sln
    branches/linuxport/sources/visualisations/WaveForm/Waveform.vcproj

Removed Paths:
-------------
    branches/linuxport/docs/visualisations/OpenGLSpectrum.zip
    branches/linuxport/docs/visualisations/Waveform.zip
    branches/linuxport/docs/visualisations/opengl_spectrum_win32.zip
    branches/linuxport/docs/visualisations/waveform_win32.zip

Deleted: branches/linuxport/docs/visualisations/OpenGLSpectrum.zip
===================================================================
(Binary files differ)

Deleted: branches/linuxport/docs/visualisations/Waveform.zip
===================================================================
(Binary files differ)

Deleted: branches/linuxport/docs/visualisations/opengl_spectrum_win32.zip
===================================================================
(Binary files differ)

Deleted: branches/linuxport/docs/visualisations/waveform_win32.zip
===================================================================
(Binary files differ)

Added: branches/linuxport/sources/visualisations/OpenGLSpectrum/Makefile
===================================================================
--- branches/linuxport/sources/visualisations/OpenGLSpectrum/Makefile	                        (rev 0)
+++ branches/linuxport/sources/visualisations/OpenGLSpectrum/Makefile	2008-03-16 02:15:54 UTC (rev 12121)
@@ -0,0 +1,12 @@
+INCLUDES=-I. -I.. -I../../../XBMC/xbmc/linux -I../../../XBMC/xbmc
+
+SRCS=opengl_spectrum.cpp
+
+LIB=opengl_spectrum.vis
+DEFINES+=-DHAS_SDL_OPENGL -DHAS_SDL
+
+include ../../../XBMC/Makefile.include
+
+vis:
+	$(MAKE)
+	$(CXX) -fpic -shared -g -o $(LIB) $(OBJS)

Added: branches/linuxport/sources/visualisations/OpenGLSpectrum/opengl_spectrum.cpp
===================================================================
--- branches/linuxport/sources/visualisations/OpenGLSpectrum/opengl_spectrum.cpp	                        (rev 0)
+++ branches/linuxport/sources/visualisations/OpenGLSpectrum/opengl_spectrum.cpp	2008-03-16 02:15:54 UTC (rev 12121)
@@ -0,0 +1,283 @@
+/*  XMMS - Cross-platform multimedia player
+ *  Copyright (C) 1998-2000  Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/*
+ *  Wed May 24 10:49:37 CDT 2000
+ *  Fixes to threading/context creation for the nVidia X4 drivers by 
+ *  Christian Zander <phoenix@...>
+ */
+
+/*
+ *  Ported to XBMC by d4rk
+ *  Also added 'hSpeed' to animate transition between bar heights
+ */
+
+
+#ifdef HAS_XBOX_HARDWARE
+#include <xtl.h>
+#endif
+#include "../../../XBMC/visualisations/xbmc_vis.h"
+#include <math.h>
+#ifdef HAS_SDL_OPENGL
+#include <GL/glew.h>
+#endif
+
+#define NUM_BANDS 16
+
+GLfloat y_angle = 45.0, y_speed = 0.5;
+GLfloat x_angle = 20.0, x_speed = 0.0;
+GLfloat z_angle = 0.0, z_speed = 0.0;
+GLfloat heights[16][16], cHeights[16][16], scale;
+GLfloat hSpeed = 0.05;
+
+extern "C" void Create(void* pd3dDevice, int iPosX, int iPosY, int iWidth, int iHeight, const char* szVisualisationName, float fPixelRatio)
+{
+
+}
+
+void draw_rectangle(GLfloat x1, GLfloat y1, GLfloat z1, GLfloat x2, GLfloat y2, GLfloat z2)
+{
+  if(y1 == y2)
+    {	
+      glVertex3f(x1, y1, z1);
+      glVertex3f(x2, y1, z1);
+      glVertex3f(x2, y2, z2);
+		
+      glVertex3f(x2, y2, z2);
+      glVertex3f(x1, y2, z2);
+      glVertex3f(x1, y1, z1);
+    }
+  else
+    {
+      glVertex3f(x1, y1, z1);
+      glVertex3f(x2, y1, z2);
+      glVertex3f(x2, y2, z2);
+		
+      glVertex3f(x2, y2, z2);
+      glVertex3f(x1, y2, z1);
+      glVertex3f(x1, y1, z1);
+    }
+}
+
+void draw_bar(GLfloat x_offset, GLfloat z_offset, GLfloat height, GLfloat red, GLfloat green, GLfloat blue )
+{
+  GLfloat width = 0.1;
+
+  glColor3f(red,green,blue);
+  draw_rectangle(x_offset, height, z_offset, x_offset + width, height, z_offset + 0.1);
+  draw_rectangle(x_offset, 0, z_offset, x_offset + width, 0, z_offset + 0.1);
+	
+  glColor3f(0.5 * red, 0.5 * green, 0.5 * blue);
+  draw_rectangle(x_offset, 0.0, z_offset + 0.1, x_offset + width, height, z_offset + 0.1);
+  draw_rectangle(x_offset, 0.0, z_offset, x_offset + width, height, z_offset );
+
+  glColor3f(0.25 * red, 0.25 * green, 0.25 * blue);
+  draw_rectangle(x_offset, 0.0, z_offset , x_offset, height, z_offset + 0.1);	
+  draw_rectangle(x_offset + width, 0.0, z_offset , x_offset + width, height, z_offset + 0.1);	
+}
+
+void draw_bars(void)
+{
+  int x,y;
+  GLfloat x_offset, z_offset, r_base, b_base;
+
+  //glClearColor(0,0,0,0);
+  glClear(GL_DEPTH_BUFFER_BIT);
+  glPushMatrix();
+  glTranslatef(0.0,-0.5,-5.0);	      
+  glRotatef(x_angle,1.0,0.0,0.0);
+  glRotatef(y_angle,0.0,1.0,0.0);
+  glRotatef(z_angle,0.0,0.0,1.0);
+
+  glBegin(GL_TRIANGLES);
+  for(y = 0; y < 16; y++)
+    {
+      z_offset = -1.6 + ((15 - y) * 0.2);
+
+      b_base = y * (1.0 / 15);
+      r_base = 1.0 - b_base;
+			
+      for(x = 0; x < 16; x++)
+        {
+          x_offset = -1.6 + (x * 0.2);			
+          if (::fabs(cHeights[y][x]-heights[y][x])>hSpeed) {
+            if (cHeights[y][x]<heights[y][x]) {
+              cHeights[y][x] += hSpeed;
+            } else {
+              cHeights[y][x] -= hSpeed;
+            }
+          }
+          draw_bar(x_offset, z_offset, cHeights[y][x], r_base - (x * (r_base / 15.0)), x * (1.0 / 15), b_base);
+        }
+    }
+  glEnd();
+  glPopMatrix();
+}
+
+//-- Render -------------------------------------------------------------------
+// Called once per frame. Do all rendering here.
+//-----------------------------------------------------------------------------
+extern "C" void Render()
+{
+  bool configured = true; //FALSE;
+
+  glDisable(GL_BLEND);
+  glMatrixMode(GL_PROJECTION);
+  glPushMatrix();
+  glLoadIdentity();
+  glFrustum(-1, 1, -1, 1, 1.5, 10);
+  glMatrixMode(GL_MODELVIEW);
+  glPushMatrix();
+  glLoadIdentity();
+  glEnable(GL_DEPTH_TEST);
+  glDepthFunc(GL_LESS);
+  glPolygonMode(GL_FRONT, GL_FILL);
+  //glPolygonMode(GL_BACK, GL_FILL);
+  if(configured)
+    {
+      x_angle += x_speed;
+      if(x_angle >= 360.0)
+        x_angle -= 360.0;
+            
+      y_angle += y_speed;
+      if(y_angle >= 360.0)
+        y_angle -= 360.0;
+            
+      z_angle += z_speed;
+      if(z_angle >= 360.0)
+        z_angle -= 360.0;
+            
+      draw_bars();
+    }
+  glPopMatrix();
+  glMatrixMode(GL_PROJECTION);
+  glPopMatrix();
+  glDisable(GL_DEPTH_TEST);
+  glEnable(GL_BLEND);
+}
+
+extern "C" void Start(int iChannels, int iSamplesPerSec, int iBitsPerSample, const char* szSongName)
+{
+  int x, y;
+
+  for(x = 0; x < 16; x++)
+    {
+      for(y = 0; y < 16; y++)
+        {
+          cHeights[y][x] = 0.0;
+        }
+    }
+
+  scale = 1.0 / log(256.0);
+
+  x_speed = 0.0;
+  y_speed = 0.5;
+  z_speed = 0.0;
+  x_angle = 20.0;
+  y_angle = 45.0;
+  z_angle = 0.0;
+}
+
+extern "C" void Stop()
+{
+
+}
+
+extern "C" void AudioData(short* pAudioData, int iAudioDataLength, float *pFreqData, int iFreqDataLength)
+{
+  int i,c;
+  int y=0;
+  GLfloat val;
+
+  int xscale[] = {0, 1, 2, 3, 5, 7, 10, 14, 20, 28, 40, 54, 74, 101, 137, 187, 255};
+
+  for(y = 15; y > 0; y--)
+    {
+      for(i = 0; i < 16; i++)
+        {
+          heights[y][i] = heights[y - 1][i];
+        }
+    }
+	
+  for(i = 0; i < NUM_BANDS; i++)
+    {
+      for(c = xscale[i], y = 0; c < xscale[i + 1]; c++)
+        {
+          if (c<iAudioDataLength) {
+            if(pAudioData[c] > y)
+              y = (int)pAudioData[c];
+          } else {
+            continue;
+          }
+        }
+      y >>= 7;
+      if(y > 0)
+#ifdef _WIN32PC
+        val = (logf(y) * scale);
+#else
+        val = (logf(y) * scale);
+#endif
+      else
+        val = 0;				
+      heights[0][i] = val;		
+    }
+}
+
+
+//-- GetInfo ------------------------------------------------------------------
+// Tell XBMC our requirements
+//-----------------------------------------------------------------------------
+extern "C" void GetInfo(VIS_INFO* pInfo)
+{
+  pInfo->bWantsFreq = false;
+  pInfo->iSyncDelay = 0;
+}
+
+
+//-- OnAction -----------------------------------------------------------------
+// Handle XBMC actions such as next preset, lock preset, album art changed etc
+//-----------------------------------------------------------------------------
+extern "C" bool OnAction(long flags, void *param)
+{
+  bool ret = false;
+  return ret;
+}
+
+//-- GetPresets ---------------------------------------------------------------
+// Return a list of presets to XBMC for display
+//-----------------------------------------------------------------------------
+extern "C" void GetPresets(char ***pPresets, int *currentPreset, int *numPresets, bool *locked)
+{
+
+}
+
+//-- GetSettings --------------------------------------------------------------
+// Return the settings for XBMC to display
+//-----------------------------------------------------------------------------
+extern "C" void GetSettings(vector<VisSetting> **vecSettings)
+{
+  return;
+}
+
+//-- UpdateSetting ------------------------------------------------------------
+// Handle setting change request from XBMC
+//-----------------------------------------------------------------------------
+extern "C" void UpdateSetting(int num)
+{
+
+}

Added: branches/linuxport/sources/visualisations/OpenGLSpectrum/opengl_spectrum.h
===================================================================
--- branches/linuxport/sources/visualisations/OpenGLSpectrum/opengl_spectrum.h	                        (rev 0)
+++ branches/linuxport/sources/visualisations/OpenGLSpectrum/opengl_spectrum.h	2008-03-16 02:15:54 UTC (rev 12121)
@@ -0,0 +1,13 @@
+#ifndef OPENGL_SPECTRUM_H
+
+extern void oglspectrum_configure(void);
+extern void oglspectrum_read_config(void);
+
+typedef struct
+{
+	gboolean tdfx_mode;
+} OGLSpectrumConfig;
+
+extern OGLSpectrumConfig oglspectrum_cfg;
+
+#endif

Added: branches/linuxport/sources/visualisations/OpenGLSpectrum/opengl_spectrum.sln
===================================================================
--- branches/linuxport/sources/visualisations/OpenGLSpectrum/opengl_spectrum.sln	                        (rev 0)
+++ branches/linuxport/sources/visualisations/OpenGLSpectrum/opengl_spectrum.sln	2008-03-16 02:15:54 UTC (rev 12121)
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opengl_spectrum", "opengl_spectrum.vcproj", "{0D91724A-E6F6-4708-AF47-9F88BBE2114B}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{0D91724A-E6F6-4708-AF47-9F88BBE2114B}.Debug.ActiveCfg = Debug|Win32
+		{0D91724A-E6F6-4708-AF47-9F88BBE2114B}.Debug.Build.0 = Debug|Win32
+		{0D91724A-E6F6-4708-AF47-9F88BBE2114B}.Release.ActiveCfg = Release|Win32
+		{0D91724A-E6F6-4708-AF47-9F88BBE2114B}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal

Added: branches/linuxport/sources/visualisations/OpenGLSpectrum/opengl_spectrum.vcproj
===================================================================
--- branches/linuxport/sources/visualisations/OpenGLSpectrum/opengl_spectrum.vcproj	                        (rev 0)
+++ branches/linuxport/sources/visualisations/OpenGLSpectrum/opengl_spectrum.vcproj	2008-03-16 02:15:54 UTC (rev 12121)
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="opengl_spectrum"
+	ProjectGUID="{0D91724A-E6F6-4708-AF47-9F88BBE2114B}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OPENGL_SPEKTRUM_EXPORTS; HAS_SDL_OPENGL;HAS_SDL;_WIN32PC"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="opengl32.lib"
+				OutputFile="$(OutDir)/opengl_spectrum.vis"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/opengl_spektrum.pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/opengl_spektrum.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAS_SDL_OPENGL;HAS_SDL;_WIN32PC"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="opengl32.lib winmm.lib ws2_32.lib"
+				OutputFile="$(OutDir)/opengl_spectrum.vis"
+				LinkIncremental="1"
+				GenerateDebugInformation="FALSE"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/opengl_spektrum.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Quelldateien"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath=".\opengl_spectrum.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Headerdateien"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\opengl_spectrum.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Ressourcendateien"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+		<File
+			RelativePath=".\ReadMe.txt">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Added: branches/linuxport/sources/visualisations/WaveForm/Main.cpp
===================================================================
--- branches/linuxport/sources/visualisations/WaveForm/Main.cpp	                        (rev 0)
+++ branches/linuxport/sources/visualisations/WaveForm/Main.cpp	2008-03-16 02:15:54 UTC (rev 12121)
@@ -0,0 +1,213 @@
+// Waveform.vis
+// A simple visualisation example by MrC
+
+#ifdef HAS_XBOX_HARDWARE
+#include <xtl.h>
+#endif
+#include "../../../XBMC/visualisations/xbmc_vis.h"
+#ifdef HAS_SDL_OPENGL
+#include <SDL/SDL_opengl.h>
+#endif
+
+char g_visName[512];
+#ifndef HAS_SDL_OPENGL
+LPDIRECT3DDEVICE8 g_device;
+#else
+void* g_device;
+#endif
+float g_fWaveform[2][512];
+
+#ifdef HAS_SDL_OPENGL
+typedef struct {
+  int X;
+  int Y;
+  int Width;
+  int Height;
+  int MinZ;
+  int MaxZ;
+} D3DVIEWPORT8;
+#ifdef _WIN32PC
+typedef unsigned long D3DCOLOR;
+#endif
+#endif
+
+D3DVIEWPORT8  g_viewport;
+
+struct Vertex_t
+{
+  float x, y, z, w;
+  D3DCOLOR  col;
+};
+
+#ifndef HAS_SDL_OPENGL
+#define VERTEX_FORMAT     (D3DFVF_XYZRHW | D3DFVF_DIFFUSE)
+#endif
+
+//-- Create -------------------------------------------------------------------
+// Called once when the visualisation is created by XBMC. Do any setup here.
+//-----------------------------------------------------------------------------
+#ifndef HAS_SDL_OPENGL
+extern "C" void Create(LPDIRECT3DDEVICE8 pd3dDevice, int iPosX, int iPosY, int iWidth, int iHeight, const char* szVisualisationName, float fPixelRatio)
+#else
+extern "C" void Create(void* pd3dDevice, int iPosX, int iPosY, int iWidth, int iHeight, const char* szVisualisationName, float fPixelRatio)
+#endif
+{
+  //printf("Creating Waveform\n");
+  strcpy(g_visName, szVisualisationName);
+  g_device = pd3dDevice;
+  g_viewport.X = iPosX;
+  g_viewport.Y = iPosY;
+  g_viewport.Width = iWidth;
+  g_viewport.Height = iHeight;
+  g_viewport.MinZ = 0;
+  g_viewport.MaxZ = 1;
+}
+
+//-- Start --------------------------------------------------------------------
+// Called when a new soundtrack is played
+//-----------------------------------------------------------------------------
+extern "C" void Start(int iChannels, int iSamplesPerSec, int iBitsPerSample, const char* szSongName)
+{
+  //printf("Got Start Command\n");
+}
+
+//-- Stop ---------------------------------------------------------------------
+// Called when the visualisation is closed by XBMC
+//-----------------------------------------------------------------------------
+extern "C" void Stop()
+{
+  //printf("Got Stop Command\n");
+}
+
+//-- Audiodata ----------------------------------------------------------------
+// Called by XBMC to pass new audio data to the vis
+//-----------------------------------------------------------------------------
+extern "C" void AudioData(short* pAudioData, int iAudioDataLength, float *pFreqData, int iFreqDataLength)
+{
+  // Convert the audio data into a floating -1 to +1 range
+  int ipos=0;
+  while (ipos < 512)
+  {
+    for (int i=0; i < iAudioDataLength; i+=2)
+    {
+      g_fWaveform[0][ipos] = pAudioData[i] / 32768.0f;    // left channel
+      g_fWaveform[1][ipos] = pAudioData[i+1] / 32768.0f;  // right channel
+      ipos++;
+      if (ipos >= 512) break;
+    }
+  }
+}
+
+
+//-- Render -------------------------------------------------------------------
+// Called once per frame. Do all rendering here.
+//-----------------------------------------------------------------------------
+extern "C" void Render()
+{
+  Vertex_t  verts[512];
+
+#ifndef HAS_SDL_OPENGL
+  g_device->SetVertexShader(VERTEX_FORMAT);
+  g_device->SetPixelShader(NULL);
+#endif
+
+  // Left channel
+#ifdef HAS_SDL_OPENGL
+  GLenum errcode;
+  glColor3f(1.0, 1.0, 1.0);
+  glDisable(GL_BLEND);
+  glPushMatrix();
+  glTranslatef(0,0,-1.0);
+  glBegin(GL_LINE_STRIP);
+#endif
+  for (int i = 0; i < 256; i++)
+  {
+    verts[i].col = 0xffffffff;
+    verts[i].x = g_viewport.X + ((i / 255.0f) * g_viewport.Width);
+    verts[i].y = g_viewport.Y + g_viewport.Height * 0.33f + (g_fWaveform[0][i] * g_viewport.Height * 0.15f);
+    verts[i].z = 1.0;
+    verts[i].w = 1;    
+#ifdef HAS_SDL_OPENGL
+    glVertex2f(verts[i].x, verts[i].y);
+#endif
+  }
+
+#ifdef HAS_SDL_OPENGL
+  glEnd();
+  if ((errcode=glGetError())!=GL_NO_ERROR) {
+    printf("Houston, we have a GL problem: %s\n", gluErrorString(errcode));
+  }
+#elif !defined(HAS_SDL_OPENGL)
+  g_device->DrawPrimitiveUP(D3DPT_LINESTRIP, 255, verts, sizeof(Vertex_t));
+#endif
+
+  // Right channel
+#ifdef HAS_SDL_OPENGL
+  glBegin(GL_LINE_STRIP);
+#endif
+  for (int i = 0; i < 256; i++)
+  {
+    verts[i].col = 0xffffffff;
+    verts[i].x = g_viewport.X + ((i / 255.0f) * g_viewport.Width);
+    verts[i].y = g_viewport.Y + g_viewport.Height * 0.66f + (g_fWaveform[1][i] * g_viewport.Height * 0.15f);
+    verts[i].z = 1.0;
+    verts[i].w = 1;
+#ifdef HAS_SDL_OPENGL
+    glVertex2f(verts[i].x, verts[i].y);
+#endif
+  }
+
+#ifdef HAS_SDL_OPENGL
+  glEnd();
+  glEnable(GL_BLEND);
+  glPopMatrix();
+  if ((errcode=glGetError())!=GL_NO_ERROR) {
+    printf("Houston, we have a GL problem: %s\n", gluErrorString(errcode));
+  }
+#elif !defined(HAS_SDL_OPENGL)
+  g_device->DrawPrimitiveUP(D3DPT_LINESTRIP, 255, verts, sizeof(Vertex_t));
+#endif
+
+}
+
+//-- GetInfo ------------------------------------------------------------------
+// Tell XBMC our requirements
+//-----------------------------------------------------------------------------
+extern "C" void GetInfo(VIS_INFO* pInfo)
+{
+  pInfo->bWantsFreq = false;
+  pInfo->iSyncDelay = 0;
+}
+
+//-- OnAction -----------------------------------------------------------------
+// Handle XBMC actions such as next preset, lock preset, album art changed etc
+//-----------------------------------------------------------------------------
+extern "C" bool OnAction(long flags, void *param)
+{
+  bool ret = false;
+  return ret;
+}
+
+//-- GetPresets ---------------------------------------------------------------
+// Return a list of presets to XBMC for display
+//-----------------------------------------------------------------------------
+extern "C" void GetPresets(char ***pPresets, int *currentPreset, int *numPresets, bool *locked)
+{
+
+}
+
+//-- GetSettings --------------------------------------------------------------
+// Return the settings for XBMC to display
+//-----------------------------------------------------------------------------
+extern "C" void GetSettings(vector<VisSetting> **vecSettings)
+{
+  return;
+}
+
+//-- UpdateSetting ------------------------------------------------------------
+// Handle setting change request from XBMC
+//-----------------------------------------------------------------------------
+extern "C" void UpdateSetting(int num)
+{
+
+}

Added: branches/linuxport/sources/visualisations/WaveForm/Makefile
===================================================================
--- branches/linuxport/sources/visualisations/WaveForm/Makefile	                        (rev 0)
+++ branches/linuxport/sources/visualisations/WaveForm/Makefile	2008-03-16 02:15:54 UTC (rev 12121)
@@ -0,0 +1,12 @@
+INCLUDES=-I. -I.. -I../../../XBMC/xbmc/linux -I../../../XBMC/xbmc
+
+SRCS=Main.cpp
+
+LIB=Waveform.vis
+DEFINES+=-DHAS_SDL_OPENGL -DHAS_SDL
+
+include ../../../XBMC/Makefile.include
+
+vis:
+	$(MAKE)
+	$(CXX) -fpic -shared -o $(LIB) $(OBJS)

Added: branches/linuxport/sources/visualisations/WaveForm/Waveform.sln
===================================================================
--- branches/linuxport/sources/visualisations/WaveForm/Waveform.sln	                        (rev 0)
+++ branches/linuxport/sources/visualisations/WaveForm/Waveform.sln	2008-03-16 02:15:54 UTC (rev 12121)
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Waveform", "Waveform.vcproj", "{D450FE9A-CE56-4496-B4AB-379094E642F2}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{D450FE9A-CE56-4496-B4AB-379094E642F2}.Debug.ActiveCfg = Debug|Win32
+		{D450FE9A-CE56-4496-B4AB-379094E642F2}.Debug.Build.0 = Debug|Win32
+		{D450FE9A-CE56-4496-B4AB-379094E642F2}.Release.ActiveCfg = Release|Win32
+		{D450FE9A-CE56-4496-B4AB-379094E642F2}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal

Added: branches/linuxport/sources/visualisations/WaveForm/Waveform.vcproj
===================================================================
--- branches/linuxport/sources/visualisations/WaveForm/Waveform.vcproj	                        (rev 0)
+++ branches/linuxport/sources/visualisations/WaveForm/Waveform.vcproj	2008-03-16 02:15:54 UTC (rev 12121)
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="Waveform"
+	ProjectGUID="{D450FE9A-CE56-4496-B4AB-379094E642F2}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAS_SDL_OPENGL;HAS_SDL;WAVEFORM_EXPORTS;_WIN32PC"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="opengl32.lib glu32.lib"
+				OutputFile="$(OutDir)/Waveform.dll"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/Waveform.pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/Waveform.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAS_SDL_OPENGL;HAS_SDL;_USRDLL;WAVEFORM_EXPORTS;_WIN32PC"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="opengl32.lib winmm.lib ws2_32.lib glu32.lib"
+				OutputFile="$(OutDir)/Waveform.vis"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/Waveform.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath=".\Main.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12625
          http://xbmc.svn.sourceforge.net/xbmc/?rev=12625&view=rev
Author:   spiff_
Date:     2008-04-10 14:06:16 -0700 (Thu, 10 Apr 2008)

Log Message:
-----------
fixed: sid codec was broken

Modified Paths:
--------------
    branches/linuxport/XBMC/system/players/paplayer/libsidplay2-i486-linux.so
    branches/linuxport/sources/paplayer/SIDCodec/Makefile

Modified: branches/linuxport/XBMC/system/players/paplayer/libsidplay2-i486-linux.so
===================================================================
(Binary files differ)

Modified: branches/linuxport/sources/paplayer/SIDCodec/Makefile
===================================================================
--- branches/linuxport/sources/paplayer/SIDCodec/Makefile	2008-04-10 20:57:10 UTC (rev 12624)
+++ branches/linuxport/sources/paplayer/SIDCodec/Makefile	2008-04-10 21:06:16 UTC (rev 12625)
@@ -2,7 +2,7 @@
 OBJS=libsidplay/src/mos6510/mos6510.o libsidplay/src/mos6526/mos6526.o libsidplay/src/mos656x/mos656x.o  libsidplay/src/sid6526/sid6526.o libsidplay/src/sidtune/IconInfo.o libsidplay/src/sidtune/InfoFile.o libsidplay/src/sidtune/MUS.o libsidplay/src/sidtune/p00.o libsidplay/src/sidtune/PP20.o libsidplay/src/sidtune/prg.o libsidplay/src/sidtune/PSID.o libsidplay/src/sidtune/SidTune.o libsidplay/src/sidtune/SidTuneTools.o libsidplay/src/xsid/xsid.o libsidplay/src/config.o resid/envelope.o libsidplay/src/event.o resid/extfilt.o resid/filter.o libsidplay/src/mixer.o libsidplay/src/player.o resid/pot.o libsidplay/src/psiddrv.o libsidplay/src/reloc65.o builders/resid-builder/src/resid-builder.o builders/resid-builder/src/resid.o resid/sid.o libsidplay/src/sidplay2.o resid/version.o resid/voice.o resid/wave.o resid/wave6581__ST.o resid/wave6581_P_T.o resid/wave6581_PS_.o resid/wave6581_PST.o resid/wave8580__ST.o resid/wave8580_P_T.o resid/wave8580_PS_.o resid/wave8580_PST.o libsidplay/win/VC/XBMCSID.o
 
 libsidplay2-i486-linux.so: $(OBJS)
-	gcc -fPIC -shared -o $@ $(OBJS) `cat ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.def` ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.o
+	gcc -fPIC -shared -o $@ $(OBJS) ../../../XBMC/xbmc/linux/XHandle.o `cat ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.def` ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.o
 
 clean:
 	$(RM) $(OBJS) *.so


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12779
          http://xbmc.svn.sourceforge.net/xbmc/?rev=12779&view=rev
Author:   spiff_
Date:     2008-04-22 12:57:43 -0700 (Tue, 22 Apr 2008)

Log Message:
-----------
fixed: libid3tag wasn't properly wrapped

Modified Paths:
--------------
    branches/linuxport/XBMC/system/libid3tag-i486-linux.so
    branches/linuxport/sources/libid3tag/libid3tag/make-xbmc-lib.sh

Modified: branches/linuxport/XBMC/system/libid3tag-i486-linux.so
===================================================================
(Binary files differ)

Modified: branches/linuxport/sources/libid3tag/libid3tag/make-xbmc-lib.sh
===================================================================
--- branches/linuxport/sources/libid3tag/libid3tag/make-xbmc-lib.sh	2008-04-22 19:28:23 UTC (rev 12778)
+++ branches/linuxport/sources/libid3tag/libid3tag/make-xbmc-lib.sh	2008-04-22 19:57:43 UTC (rev 12779)
@@ -1,3 +1,3 @@
 #!/bin/bash 
 
-ld -o libid3tag-i486-linux.so --export-dynamic -shared  --whole-archive .libs/libid3tag.a `grep __wrap ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.c | grep -v bash | awk -F"__wrap_"  '{print $2}' | awk -F"(" '{out=out"--wrap "$1" "} END {print out}'` 
+g++ -shared -o libid3tag-i486-linux.so .libs/*.o `cat ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.def` ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.o


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13924
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13924&view=rev
Author:   spiff_
Date:     2008-07-04 05:16:27 -0700 (Fri, 04 Jul 2008)

Log Message:
-----------
changed: compile the paplayer ac3 codec instead of keeping binary in svn (linux x86 only for now). hopefully this 
will get the ball rolling =P

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/Makefile

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/

Removed Paths:
-------------
    branches/linuxport/XBMC/system/players/paplayer/ac3codec-i486-linux.so
    branches/linuxport/sources/paplayer/AC3Codec/

Modified: branches/linuxport/XBMC/Makefile.in
===================================================================
--- branches/linuxport/XBMC/Makefile.in	2008-07-04 11:57:39 UTC (rev 13923)
+++ branches/linuxport/XBMC/Makefile.in	2008-07-04 12:16:27 UTC (rev 13924)
@@ -1,4 +1,4 @@
-DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP
+DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec
 
 LIBS=@LIBS@
 DEBUG_FLAGS=@DEBUG_FLAGS@
@@ -84,8 +84,10 @@
 	$(MAKE) -C tools/EventClients
 librtmp: 
 	$(MAKE) -C xbmc/lib/libRTMP
+papcodecs:
+	$(MAKE) -C xbmc/cores/paplayer/AC3Codec
 	
-compile: guilib xbmc filesystem musicdatabase videodatabase cores paplayer dllloader exports xbox linux visualizations screensavers utils common tinyxml sqllite libscrobbler libgoahead unrarxlib libpython dvdplayer libupnp cdrip libcmyth librtmp
+compile: guilib xbmc filesystem musicdatabase videodatabase cores paplayer dllloader exports xbox linux visualizations screensavers utils common tinyxml sqllite libscrobbler libgoahead unrarxlib libpython dvdplayer libupnp cdrip libcmyth librtmp papcodecs
 
 xbmc.bin: $(wildcard xbmc/*.o xbmc/settings/*.o guilib/*.o guilib/tinyXML/*.o guilib/common/*.o xbmc/FileSystem/*.o xbmc/FileSystem/VideoDatabaseDirectory/*.o xbmc/FileSystem/MusicDatabaseDirectory/*.o xbmc/visualizations/*.o xbmc/screensavers/*.o xbmc/cores/*.o xbmc/cores/paplayer/*.o xbmc/linux/*.o xbmc/lib/sqLite/*.o xbmc/lib/libscrobbler/*.o xbmc/lib/libPython/*.o xbmc/lib/libPython/xbmcmodule/*.o xbmc/xbox/*.o xbmc/cores/DllLoader/*.o xbmc/cores/DllLoader/exports/*.o xbmc/cores/DllLoader/exports/util/*.o xbmc/utils/*.o xbmc/lib/UnrarXLib/*.o xbmc/lib/libGoAhead/*.o xbmc/cores/dvdplayer/*.o xbmc/cores/dvdplayer/DVDSubtitles/*.o xbmc/cores/dvdplayer/DVDInputStreams/*.o xbmc/cores/dvdplayer/DVDCodecs/*.o xbmc/cores/dvdplayer/DVDCodecs/Audio/*.o xbmc/cores/dvdplayer/DVDCodecs/Video/*.o xbmc/cores/dvdplayer/DVDCodecs/Overlay/*.o xbmc/cores/dvdplayer/DVDDemuxers/*.o xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc/*.o xbmc/cores/VideoRenderers/*.o xbmc/cores/VideoRenderers/VideoShaders/*.o xbmc/cdrip/*.o xbmc/lib/libcmyth/*.o xbmc/lib/libRTMP/*.o) xbmc/lib/libXBMS/libxbms-@... xbmc/lib/libUPnP/libupnp-@... 
 	g++ $(DEBUG_FLAGS) -o xbmc.bin xbmc/*.o xbmc/settings/*.o xbmc/cdrip/*.o guilib/*.o guilib/tinyXML/*.o guilib/common/*.o xbmc/FileSystem/*.o xbmc/FileSystem/VideoDatabaseDirectory/*.o xbmc/FileSystem/MusicDatabaseDirectory/*.o xbmc/visualizations/*.o xbmc/screensavers/*.o xbmc/cores/*.o xbmc/cores/paplayer/*.o xbmc/linux/*.o xbmc/lib/sqLite/*.o xbmc/lib/libscrobbler/*.o xbmc/lib/libPython/*.o xbmc/lib/libPython/xbmcmodule/*.o xbmc/xbox/*.o xbmc/cores/DllLoader/*.o xbmc/cores/DllLoader/exports/*.o xbmc/cores/DllLoader/exports/util/*.o xbmc/utils/*.o xbmc/lib/UnrarXLib/*.o xbmc/lib/libGoAhead/*.o xbmc/cores/dvdplayer/*.o xbmc/cores/dvdplayer/DVDSubtitles/*.o xbmc/cores/dvdplayer/DVDInputStreams/*.o xbmc/cores/dvdplayer/DVDCodecs/*.o xbmc/cores/dvdplayer/DVDCodecs/Audio/*.o xbmc/cores/dvdplayer/DVDCodecs/Video/*.o xbmc/cores/dvdplayer/DVDCodecs/Overlay/*.o xbmc/cores/dvdplayer/DVDDemuxers/*.o xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc/*.o xbmc/cores/VideoRenderers/*.o xbmc/cores/VideoRenderers/VideoShaders/*.o xbmc/lib/libcmyth/*.o xbmc/lib/libRTMP/*.o xbmc/lib/libGoAhead/libGoAheadD-@... xbmc/lib/libXBMS/libxbms-@... xbmc/lib/libUPnP/libupnp-@... xbmc/lib/libshout/libshout-@... xbmc/lib/libRTV/librtv-@... xbmc/lib/libXDAAP/libxdaap-@... xbmc/lib/libcdio/libcdio-@... xbmc/lib/libsmb/libsmbclient-@... $(LIBS) -rdynamic

Deleted: branches/linuxport/XBMC/system/players/paplayer/ac3codec-i486-linux.so
===================================================================
(Binary files differ)

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec (from rev 13876, branches/linuxport/sources/paplayer/AC3Codec)

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/Makefile
===================================================================
--- branches/linuxport/sources/paplayer/AC3Codec/Makefile	2008-07-01 17:48:07 UTC (rev 13876)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/Makefile	2008-07-04 12:16:27 UTC (rev 13924)
@@ -2,7 +2,7 @@
 OBJS=liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o liba52/imdct.o liba52/parse.o
 
 ac3codec-i486-linux.so: $(OBJS)
-	gcc -fPIC -shared -o $@ $(OBJS) `cat ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.def` ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.o
+	gcc -fPIC -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o && cp $@ ../../../../system/players/paplayer/
 
 clean:
 	$(RM) $(OBJS) *.so


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13925
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13925&view=rev
Author:   spiff_
Date:     2008-07-04 05:26:08 -0700 (Fri, 04 Jul 2008)

Log Message:
-----------
changed: compile adpcm codec instead of keeping binary in svn (x86 linux only)

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/ADPCMCodec/Makefile

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/cores/paplayer/ADPCMCodec/

Removed Paths:
-------------
    branches/linuxport/XBMC/system/players/paplayer/adpcm-i486-linux.so
    branches/linuxport/sources/paplayer/ADPCMCodec/

Modified: branches/linuxport/XBMC/Makefile.in
===================================================================
--- branches/linuxport/XBMC/Makefile.in	2008-07-04 12:16:27 UTC (rev 13924)
+++ branches/linuxport/XBMC/Makefile.in	2008-07-04 12:26:08 UTC (rev 13925)
@@ -1,4 +1,4 @@
-DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec
+DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec
 
 LIBS=@LIBS@
 DEBUG_FLAGS=@DEBUG_FLAGS@
@@ -86,6 +86,7 @@
 	$(MAKE) -C xbmc/lib/libRTMP
 papcodecs:
 	$(MAKE) -C xbmc/cores/paplayer/AC3Codec
+	$(MAKE) -C xbmc/cores/paplayer/ADPCMCodec
 	
 compile: guilib xbmc filesystem musicdatabase videodatabase cores paplayer dllloader exports xbox linux visualizations screensavers utils common tinyxml sqllite libscrobbler libgoahead unrarxlib libpython dvdplayer libupnp cdrip libcmyth librtmp papcodecs
 

Deleted: branches/linuxport/XBMC/system/players/paplayer/adpcm-i486-linux.so
===================================================================
(Binary files differ)

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/ADPCMCodec (from rev 13876, branches/linuxport/sources/paplayer/ADPCMCodec)

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/ADPCMCodec/Makefile
===================================================================
--- branches/linuxport/sources/paplayer/ADPCMCodec/Makefile	2008-07-01 17:48:07 UTC (rev 13876)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/ADPCMCodec/Makefile	2008-07-04 12:26:08 UTC (rev 13925)
@@ -3,7 +3,7 @@
 CFLAGS=-D_LINUX -fPIC -O2
 
 apdcm-i486-linux.so: $(OBJS)
-	$(CC) -shared -o $@ *.o `cat ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.def` ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.o
+	$(CC) -shared -o $@ *.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o && cp $@ ../../../../system/players/paplayer/
 
 clean:
 	$(RM) $(OBJS) *.so


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13926
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13926&view=rev
Author:   spiff_
Date:     2008-07-04 06:25:12 -0700 (Fri, 04 Jul 2008)

Log Message:
-----------
changed: build aac codec instead of keeping binary in svn (x86 linux only)

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/AACCodec.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/DllAACCodec.h

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/

Removed Paths:
-------------
    branches/linuxport/XBMC/system/players/paplayer/AACCodec-i486-linux.so
    branches/linuxport/XBMC/xbmc/cores/paplayer/aac/
    branches/linuxport/sources/paplayer/AACCodec/

Modified: branches/linuxport/XBMC/Makefile.in
===================================================================
--- branches/linuxport/XBMC/Makefile.in	2008-07-04 12:26:08 UTC (rev 13925)
+++ branches/linuxport/XBMC/Makefile.in	2008-07-04 13:25:12 UTC (rev 13926)
@@ -1,4 +1,4 @@
-DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec
+DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec
 
 LIBS=@LIBS@
 DEBUG_FLAGS=@DEBUG_FLAGS@
@@ -85,6 +85,7 @@
 librtmp: 
 	$(MAKE) -C xbmc/lib/libRTMP
 papcodecs:
+	$(MAKE) -C xbmc/cores/paplayer/AACCodec
 	$(MAKE) -C xbmc/cores/paplayer/AC3Codec
 	$(MAKE) -C xbmc/cores/paplayer/ADPCMCodec
 	

Deleted: branches/linuxport/XBMC/system/players/paplayer/AACCodec-i486-linux.so
===================================================================
(Binary files differ)

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec (from rev 13876, branches/linuxport/sources/paplayer/AACCodec)

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/AACCodec.h
===================================================================
--- branches/linuxport/sources/paplayer/AACCodec/AACCodec.h	2008-07-01 17:48:07 UTC (rev 13876)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/AACCodec.h	2008-07-04 13:25:12 UTC (rev 13926)
@@ -9,6 +9,7 @@
 #endif
 #else
 #define AACAPI
+#include <inttypes.h>
 #define __int8 char
 #define __int32 long
 #define __int64 long long
@@ -49,7 +50,8 @@
   AAC_HE=5, /* High Efficiency (SBR) */
   AAC_ER_LC=17, /* Error Resilient Low Complexity */
   AAC_ER_LTP=19, /* Error Resilient Long Term Prediction */
-  AAC_LD=23 /* Low Delay */
+  AAC_LD=23, /* Low Delay */
+  ALAC=24 /* ALAC codec */
 } AAC_OBJECT_TYPE;
 
 /* info about a file */

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/Makefile
===================================================================
--- branches/linuxport/sources/paplayer/AACCodec/Makefile	2008-07-01 17:48:07 UTC (rev 13876)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/Makefile	2008-07-04 13:25:12 UTC (rev 13926)
@@ -4,11 +4,13 @@
 
 DIRS=alac_decoder libfaad mp4ff
 
+all: compile AACCodec-i486-linux.so
+
 AACCodec-osx.so: compile AACCodec.o utils.o
 	$(CC) -shared -bundle -flat_namespace -undefined suppress -o $@ *.o alac_decoder/*.o libfaad/*.o mp4ff/*.o
 
 AACCodec-i486-linux.so: compile AACCodec.o utils.o
-	$(CC) -shared -o $@ *.o alac_decoder/*.o libfaad/*.o mp4ff/*.o `cat ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.def` ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.o
+	$(CC) -shared -o $@ *.o alac_decoder/*.o libfaad/*.o mp4ff/*.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o && cp $@ ../../../../system/players/paplayer
 
 compile:
 	$(MAKE) -C alac_decoder

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/DllAACCodec.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/DllAACCodec.h	2008-07-04 12:26:08 UTC (rev 13925)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/DllAACCodec.h	2008-07-04 13:25:12 UTC (rev 13926)
@@ -22,7 +22,7 @@
  */
 
 #include "DynamicDll.h"
-#include "aac/AACCodec.h"
+#include "AACCodec/AACCodec.h"
 
 class DllAACCodecInterface
 {
@@ -42,6 +42,10 @@
   DECLARE_DLL_WRAPPER(DllAACCodec, Q:\\system\\players\\paplayer\\AACCodec-osx.so)
 #elif !defined(_LINUX)
   DECLARE_DLL_WRAPPER(DllAACCodec, Q:\\system\\players\\paplayer\\aaccodec.dll)
+#elif defined(_POWERPC)
+  DECLARE_DLL_WRAPPER(DllAACCodec, Q:\\system\\players\\paplayer\\AACCodec-powerpc-linux.so)
+#elif defined(_POWERPC64)
+  DECLARE_DLL_WRAPPER(DllAACCodec, Q:\\system\\players\\paplayer\\AACCodec-powerpc64-linux.so)
 #else
   DECLARE_DLL_WRAPPER(DllAACCodec, Q:\\system\\players\\paplayer\\AACCodec-i486-linux.so)
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13927
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13927&view=rev
Author:   spiff_
Date:     2008-07-04 06:29:02 -0700 (Fri, 04 Jul 2008)

Log Message:
-----------
changed: compile cube codec instead of keeping binary in svn (linux x86 only)

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/Makefile

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/

Removed Paths:
-------------
    branches/linuxport/XBMC/system/players/paplayer/cube-i486-linux.so
    branches/linuxport/sources/paplayer/CubeCodec/

Modified: branches/linuxport/XBMC/Makefile.in
===================================================================
--- branches/linuxport/XBMC/Makefile.in	2008-07-04 13:25:12 UTC (rev 13926)
+++ branches/linuxport/XBMC/Makefile.in	2008-07-04 13:29:02 UTC (rev 13927)
@@ -1,4 +1,4 @@
-DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec
+DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec
 
 LIBS=@LIBS@
 DEBUG_FLAGS=@DEBUG_FLAGS@
@@ -88,6 +88,7 @@
 	$(MAKE) -C xbmc/cores/paplayer/AACCodec
 	$(MAKE) -C xbmc/cores/paplayer/AC3Codec
 	$(MAKE) -C xbmc/cores/paplayer/ADPCMCodec
+	$(MAKE) -C xbmc/cores/paplayer/CubeCodec
 	
 compile: guilib xbmc filesystem musicdatabase videodatabase cores paplayer dllloader exports xbox linux visualizations screensavers utils common tinyxml sqllite libscrobbler libgoahead unrarxlib libpython dvdplayer libupnp cdrip libcmyth librtmp papcodecs
 

Deleted: branches/linuxport/XBMC/system/players/paplayer/cube-i486-linux.so
===================================================================
(Binary files differ)

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec (from rev 13876, branches/linuxport/sources/paplayer/CubeCodec)

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/Makefile
===================================================================
--- branches/linuxport/sources/paplayer/CubeCodec/Makefile	2008-07-01 17:48:07 UTC (rev 13876)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/Makefile	2008-07-04 13:29:02 UTC (rev 13927)
@@ -3,7 +3,7 @@
 CFLAGS=-D_LINUX -fPIC -O2
 
 cube-i486-linux.so: $(OBJS)
-	$(CC) -shared -o $@ *.o `cat ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.def` ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.o
+	$(CC) -shared -o $@ *.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o && cp $@ ../../../../system/players/paplayer/
 
 clean:
 	$(RM) *.o *.so


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13928
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13928&view=rev
Author:   spiff_
Date:     2008-07-04 06:33:10 -0700 (Fri, 04 Jul 2008)

Log Message:
-----------
changed: compile nsf codec instead of keeping binary in svn (linux x86 only)

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/Makefile

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/

Removed Paths:
-------------
    branches/linuxport/XBMC/system/players/paplayer/nosefart-i486-linux.so
    branches/linuxport/sources/paplayer/NSFCodec/

Modified: branches/linuxport/XBMC/Makefile.in
===================================================================
--- branches/linuxport/XBMC/Makefile.in	2008-07-04 13:29:02 UTC (rev 13927)
+++ branches/linuxport/XBMC/Makefile.in	2008-07-04 13:33:10 UTC (rev 13928)
@@ -1,4 +1,4 @@
-DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec
+DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec
 
 LIBS=@LIBS@
 DEBUG_FLAGS=@DEBUG_FLAGS@
@@ -89,6 +89,7 @@
 	$(MAKE) -C xbmc/cores/paplayer/AC3Codec
 	$(MAKE) -C xbmc/cores/paplayer/ADPCMCodec
 	$(MAKE) -C xbmc/cores/paplayer/CubeCodec
+	$(MAKE) -C xbmc/cores/paplayer/NSFCodec
 	
 compile: guilib xbmc filesystem musicdatabase videodatabase cores paplayer dllloader exports xbox linux visualizations screensavers utils common tinyxml sqllite libscrobbler libgoahead unrarxlib libpython dvdplayer libupnp cdrip libcmyth librtmp papcodecs
 

Deleted: branches/linuxport/XBMC/system/players/paplayer/nosefart-i486-linux.so
===================================================================
(Binary files differ)

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec (from rev 13876, branches/linuxport/sources/paplayer/NSFCodec)

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/Makefile
===================================================================
--- branches/linuxport/sources/paplayer/NSFCodec/Makefile	2008-07-01 17:48:07 UTC (rev 13876)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/Makefile	2008-07-04 13:33:10 UTC (rev 13928)
@@ -2,7 +2,7 @@
 OBJS=src/cpu/nes6502/dis6502.o src/sndhrdw/fds_snd.o src/sndhrdw/fmopl.o src/log.o src/memguard.o src/sndhrdw/mmc5_snd.o src/cpu/nes6502/nes6502.o src/sndhrdw/nes_apu.o NoseFartDLL.o src/machine/nsf.o src/sndhrdw/vrc7_snd.o src/sndhrdw/vrcvisnd.o
 
 nosefart-i486-linux.so: $(OBJS)
-	gcc -fPIC -shared -o $@ $(OBJS) `cat ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.def` ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.o
+	gcc -fPIC -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o && cp $@ ../../../../system/players/paplayer
 
 clean:
 	$(RM) $(OBJS) *.so


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13929
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13929&view=rev
Author:   spiff_
Date:     2008-07-04 06:38:04 -0700 (Fri, 04 Jul 2008)

Log Message:
-----------
changed: compile midi codec instead of keeping binary in svn (x86 linux only)

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/Makefile

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/

Removed Paths:
-------------
    branches/linuxport/XBMC/system/players/paplayer/timidity-i486-linux.so
    branches/linuxport/sources/paplayer/MIDCodec/

Modified: branches/linuxport/XBMC/Makefile.in
===================================================================
--- branches/linuxport/XBMC/Makefile.in	2008-07-04 13:33:10 UTC (rev 13928)
+++ branches/linuxport/XBMC/Makefile.in	2008-07-04 13:38:04 UTC (rev 13929)
@@ -1,4 +1,4 @@
-DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec
+DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec
 
 LIBS=@LIBS@
 DEBUG_FLAGS=@DEBUG_FLAGS@
@@ -89,6 +89,7 @@
 	$(MAKE) -C xbmc/cores/paplayer/AC3Codec
 	$(MAKE) -C xbmc/cores/paplayer/ADPCMCodec
 	$(MAKE) -C xbmc/cores/paplayer/CubeCodec
+	$(MAKE) -C xbmc/cores/paplayer/MIDCodec
 	$(MAKE) -C xbmc/cores/paplayer/NSFCodec
 	
 compile: guilib xbmc filesystem musicdatabase videodatabase cores paplayer dllloader exports xbox linux visualizations screensavers utils common tinyxml sqllite libscrobbler libgoahead unrarxlib libpython dvdplayer libupnp cdrip libcmyth librtmp papcodecs

Deleted: branches/linuxport/XBMC/system/players/paplayer/timidity-i486-linux.so
===================================================================
(Binary files differ)

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec (from rev 13876, branches/linuxport/sources/paplayer/MIDCodec)

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/Makefile
===================================================================
--- branches/linuxport/sources/paplayer/MIDCodec/Makefile	2008-07-01 17:48:07 UTC (rev 13876)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/Makefile	2008-07-04 13:38:04 UTC (rev 13929)
@@ -2,7 +2,7 @@
 OBJS=timiditydll.o common.o controls.o filter.o instrum.o mix.o output.o playmidi.o readmidi.o resample.o sdl_a.o sdl_c.o tables.o timidity.o
 
 timidity-i486-linux.so: $(OBJS)
-	g++ -shared -o $@ *.o `cat ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.def` ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.o
+	g++ -shared -o $@ *.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o && cp $@ ../../../../system/players/paplayer
 
 clean:
 	$(RM) *.o *.so


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13930
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13930&view=rev
Author:   spiff_
Date:     2008-07-04 06:42:39 -0700 (Fri, 04 Jul 2008)

Log Message:
-----------
changed: compile sid codec instead of keeping binary in svn (linux x86 only)

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/Makefile

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/

Removed Paths:
-------------
    branches/linuxport/XBMC/system/players/paplayer/libsidplay2-i486-linux.so
    branches/linuxport/sources/paplayer/SIDCodec/

Modified: branches/linuxport/XBMC/Makefile.in
===================================================================
--- branches/linuxport/XBMC/Makefile.in	2008-07-04 13:38:04 UTC (rev 13929)
+++ branches/linuxport/XBMC/Makefile.in	2008-07-04 13:42:39 UTC (rev 13930)
@@ -1,4 +1,4 @@
-DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec
+DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec
 
 LIBS=@LIBS@
 DEBUG_FLAGS=@DEBUG_FLAGS@
@@ -91,6 +91,7 @@
 	$(MAKE) -C xbmc/cores/paplayer/CubeCodec
 	$(MAKE) -C xbmc/cores/paplayer/MIDCodec
 	$(MAKE) -C xbmc/cores/paplayer/NSFCodec
+	$(MAKE) -C xbmc/cores/paplayer/SIDCodec
 	
 compile: guilib xbmc filesystem musicdatabase videodatabase cores paplayer dllloader exports xbox linux visualizations screensavers utils common tinyxml sqllite libscrobbler libgoahead unrarxlib libpython dvdplayer libupnp cdrip libcmyth librtmp papcodecs
 

Deleted: branches/linuxport/XBMC/system/players/paplayer/libsidplay2-i486-linux.so
===================================================================
(Binary files differ)

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec (from rev 13876, branches/linuxport/sources/paplayer/SIDCodec)

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/Makefile
===================================================================
--- branches/linuxport/sources/paplayer/SIDCodec/Makefile	2008-07-01 17:48:07 UTC (rev 13876)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/Makefile	2008-07-04 13:42:39 UTC (rev 13930)
@@ -1,8 +1,9 @@
-CFLAGS=-D_LINUX -DHAVE_UNIX -DHAVE_STRCASECMP -DHAVE_STRNCASECMP -DHAVE_IOS_OPENMODE -fPIC -Ilibsidplay/win/VC -Ibuilders/resid-builder/include/sidplay/builders -Ilibsidplay/include/sidplay -Iresid -Ilibsidplay/include -I../../../XBMC/xbmc/linux -I../../../XBMC/xbmc
+CFLAGS=-D_LINUX -DHAVE_UNIX -DHAVE_STRCASECMP -DHAVE_STRNCASECMP -DHAVE_IOS_OPENMODE -fPIC -Ilibsidplay/win/VC -Ibuilders/resid-builder/include/sidplay/builders -Ilibsidplay/include/sidplay -Iresid -Ilibsidplay/include -I../../../linux -I../../../ -I../../../../guilib/
+
 OBJS=libsidplay/src/mos6510/mos6510.o libsidplay/src/mos6526/mos6526.o libsidplay/src/mos656x/mos656x.o  libsidplay/src/sid6526/sid6526.o libsidplay/src/sidtune/IconInfo.o libsidplay/src/sidtune/InfoFile.o libsidplay/src/sidtune/MUS.o libsidplay/src/sidtune/p00.o libsidplay/src/sidtune/PP20.o libsidplay/src/sidtune/prg.o libsidplay/src/sidtune/PSID.o libsidplay/src/sidtune/SidTune.o libsidplay/src/sidtune/SidTuneTools.o libsidplay/src/xsid/xsid.o libsidplay/src/config.o resid/envelope.o libsidplay/src/event.o resid/extfilt.o resid/filter.o libsidplay/src/mixer.o libsidplay/src/player.o resid/pot.o libsidplay/src/psiddrv.o libsidplay/src/reloc65.o builders/resid-builder/src/resid-builder.o builders/resid-builder/src/resid.o resid/sid.o libsidplay/src/sidplay2.o resid/version.o resid/voice.o resid/wave.o resid/wave6581__ST.o resid/wave6581_P_T.o resid/wave6581_PS_.o resid/wave6581_PST.o resid/wave8580__ST.o resid/wave8580_P_T.o resid/wave8580_PS_.o resid/wave8580_PST.o libsidplay/win/VC/XBMCSID.o
 
 libsidplay2-i486-linux.so: $(OBJS)
-	gcc -fPIC -shared -o $@ $(OBJS) ../../../XBMC/xbmc/linux/XHandle.o `cat ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.def` ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.o
+	gcc -fPIC -shared -o $@ $(OBJS) ../../../linux/XHandle.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o && cp $@ ../../../../system/players/paplayer/
 
 clean:
 	$(RM) $(OBJS) *.so


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13931
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13931&view=rev
Author:   spiff_
Date:     2008-07-04 06:48:42 -0700 (Fri, 04 Jul 2008)

Log Message:
-----------
changed: compiled wavpack codec instead of keeping binary in svn (linux x86)

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/DllWAVPack.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/Makefile

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/

Removed Paths:
-------------
    branches/linuxport/XBMC/system/players/paplayer/wavpack-i486-linux.so
    branches/linuxport/XBMC/xbmc/cores/paplayer/wavpack/
    branches/linuxport/sources/paplayer/WavPackCodec/

Modified: branches/linuxport/XBMC/Makefile.in
===================================================================
--- branches/linuxport/XBMC/Makefile.in	2008-07-04 13:42:39 UTC (rev 13930)
+++ branches/linuxport/XBMC/Makefile.in	2008-07-04 13:48:42 UTC (rev 13931)
@@ -1,4 +1,4 @@
-DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec
+DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec xbmc/cores/paplayer/WavPackCodec
 
 LIBS=@LIBS@
 DEBUG_FLAGS=@DEBUG_FLAGS@
@@ -92,6 +92,7 @@
 	$(MAKE) -C xbmc/cores/paplayer/MIDCodec
 	$(MAKE) -C xbmc/cores/paplayer/NSFCodec
 	$(MAKE) -C xbmc/cores/paplayer/SIDCodec
+	$(MAKE) -C xbmc/cores/paplayer/WavPackCodec
 	
 compile: guilib xbmc filesystem musicdatabase videodatabase cores paplayer dllloader exports xbox linux visualizations screensavers utils common tinyxml sqllite libscrobbler libgoahead unrarxlib libpython dvdplayer libupnp cdrip libcmyth librtmp papcodecs
 

Deleted: branches/linuxport/XBMC/system/players/paplayer/wavpack-i486-linux.so
===================================================================
(Binary files differ)

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/DllWAVPack.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/DllWAVPack.h	2008-07-04 13:42:39 UTC (rev 13930)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/DllWAVPack.h	2008-07-04 13:48:42 UTC (rev 13931)
@@ -22,7 +22,7 @@
  */
 
 #include "DynamicDll.h"
-#include "wavpack/wavpack.h"
+#include "WavPackCodec/wavpack.h"
 
 class DllWavPackInterface
 {
@@ -68,10 +68,14 @@
 
 class DllWavPack : public DllDynamic, DllWavPackInterface
 {
-#ifdef _LINUX
+#ifndef _LINUX
+  DECLARE_DLL_WRAPPER(DllWavPack, Q:\\system\\players\\paplayer\\WAVPack.dll)
+#elif defined _POWERPC
+  DECLARE_DLL_WRAPPER(DllWavPack, Q:\\system\\players\\paplayer\\wavpack-powerpc-linux.so)
+#elif defined _POWERPC64
+  DECLARE_DLL_WRAPPER(DllWavPack, Q:\\system\\players\\paplayer\\wavpack-powerpc64-linux.so)
+#else
   DECLARE_DLL_WRAPPER(DllWavPack, Q:\\system\\players\\paplayer\\wavpack-i486-linux.so)
-#else
-  DECLARE_DLL_WRAPPER(DllWavPack, Q:\\system\\players\\paplayer\\WAVPack.dll)
 #endif
   DEFINE_METHOD6(WavpackContext*, WavpackOpenFileInputEx, (stream_reader* p1, void* p2, void* p3, char* p4, int p5, int p6))
   DEFINE_METHOD4(WavpackContext*, WavpackOpenFileInput, (const char* p1, char* p2, int p3, int p4))

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec (from rev 13876, branches/linuxport/sources/paplayer/WavPackCodec)

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/Makefile
===================================================================
--- branches/linuxport/sources/paplayer/WavPackCodec/Makefile	2008-07-01 17:48:07 UTC (rev 13876)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/Makefile	2008-07-04 13:48:42 UTC (rev 13931)
@@ -2,7 +2,7 @@
 OBJS=bits.o extra1.o extra2.o float.o md5.o metadata.o pack.o unpack.o unpack3.o utils.o words.o wputils.o
 
 wavpack-i486-linux.so: $(OBJS)
-	gcc -fPIC -shared -o $@ $(OBJS) `cat ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.def` ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.o
+	gcc -fPIC -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o && cp $@ ../../../../system/players/paplayer/
 
 clean:
 	$(RM) $(OBJS) *.so


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13932
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13932&view=rev
Author:   spiff_
Date:     2008-07-04 06:52:14 -0700 (Fri, 04 Jul 2008)

Log Message:
-----------
changed: compile gym codec instead of keeping binary in svn (linux x86)

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/GYMCodec/Makefile

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/cores/paplayer/GYMCodec/

Removed Paths:
-------------
    branches/linuxport/XBMC/system/players/paplayer/gensapu-i486-linux.so
    branches/linuxport/sources/paplayer/GYMCodec/

Modified: branches/linuxport/XBMC/Makefile.in
===================================================================
--- branches/linuxport/XBMC/Makefile.in	2008-07-04 13:48:42 UTC (rev 13931)
+++ branches/linuxport/XBMC/Makefile.in	2008-07-04 13:52:14 UTC (rev 13932)
@@ -1,4 +1,4 @@
-DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec xbmc/cores/paplayer/WavPackCodec
+DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec xbmc/cores/paplayer/WavPackCodec xbmc/cores/paplayer/GYMCodec
 
 LIBS=@LIBS@
 DEBUG_FLAGS=@DEBUG_FLAGS@
@@ -89,6 +89,7 @@
 	$(MAKE) -C xbmc/cores/paplayer/AC3Codec
 	$(MAKE) -C xbmc/cores/paplayer/ADPCMCodec
 	$(MAKE) -C xbmc/cores/paplayer/CubeCodec
+	$(MAKE) -C xbmc/cores/paplayer/GYMCodec
 	$(MAKE) -C xbmc/cores/paplayer/MIDCodec
 	$(MAKE) -C xbmc/cores/paplayer/NSFCodec
 	$(MAKE) -C xbmc/cores/paplayer/SIDCodec

Deleted: branches/linuxport/XBMC/system/players/paplayer/gensapu-i486-linux.so
===================================================================
(Binary files differ)

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/GYMCodec (from rev 13876, branches/linuxport/sources/paplayer/GYMCodec)

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/GYMCodec/Makefile
===================================================================
--- branches/linuxport/sources/paplayer/GYMCodec/Makefile	2008-07-01 17:48:07 UTC (rev 13876)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/GYMCodec/Makefile	2008-07-04 13:52:14 UTC (rev 13932)
@@ -1,8 +1,8 @@
-CFLAGS=-D_LINUX -fPIC -I../../../XBMC/xbmc/linux -I../../../XBMC/xbmc
+CFLAGS=-D_LINUX -fPIC -I../../../linux -I../../../ -I../../../../guilib/
 OBJS=gym_play.cpp psg.o XBMCGYM.o ym2612.o
 
 gensapu-i486-linux.so: $(OBJS)
-	g++ -shared -o $@ *.o `cat ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.def` ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.o
+	g++ -shared -o $@ *.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o && cp $@ ../../../../system/players/paplayer/
 
 clean:
 	$(RM) *.o *.so


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13933
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13933&view=rev
Author:   spiff_
Date:     2008-07-04 06:55:21 -0700 (Fri, 04 Jul 2008)

Log Message:
-----------
changed: compile dca codec instead of keeping binary in svn (linux x86)

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/Makefile

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/

Removed Paths:
-------------
    branches/linuxport/XBMC/system/players/paplayer/dcacodec-i486-linux.so
    branches/linuxport/sources/paplayer/DCACodec/

Modified: branches/linuxport/XBMC/Makefile.in
===================================================================
--- branches/linuxport/XBMC/Makefile.in	2008-07-04 13:52:14 UTC (rev 13932)
+++ branches/linuxport/XBMC/Makefile.in	2008-07-04 13:55:21 UTC (rev 13933)
@@ -1,4 +1,4 @@
-DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec xbmc/cores/paplayer/WavPackCodec xbmc/cores/paplayer/GYMCodec
+DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec xbmc/cores/paplayer/WavPackCodec xbmc/cores/paplayer/GYMCodec xbmc/cores/paplayer/DCACodec
 
 LIBS=@LIBS@
 DEBUG_FLAGS=@DEBUG_FLAGS@
@@ -89,6 +89,7 @@
 	$(MAKE) -C xbmc/cores/paplayer/AC3Codec
 	$(MAKE) -C xbmc/cores/paplayer/ADPCMCodec
 	$(MAKE) -C xbmc/cores/paplayer/CubeCodec
+	$(MAKE) -C xbmc/cores/paplayer/DCACodec
 	$(MAKE) -C xbmc/cores/paplayer/GYMCodec
 	$(MAKE) -C xbmc/cores/paplayer/MIDCodec
 	$(MAKE) -C xbmc/cores/paplayer/NSFCodec

Deleted: branches/linuxport/XBMC/system/players/paplayer/dcacodec-i486-linux.so
===================================================================
(Binary files differ)

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec (from rev 13876, branches/linuxport/sources/paplayer/DCACodec)

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/Makefile
===================================================================
--- branches/linuxport/sources/paplayer/DCACodec/Makefile	2008-07-01 17:48:07 UTC (rev 13876)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/Makefile	2008-07-04 13:55:21 UTC (rev 13933)
@@ -2,7 +2,7 @@
 OBJS=libdts/downmix.o libdts/parse.o libdts/bitstream.o
 
 dcacodec-i486-linux.so: $(OBJS)
-	gcc -fPIC -shared -o $@ $(OBJS) `cat ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.def` ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.o
+	gcc -fPIC -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o && cp $@ ../../../../system/players/paplayer/
 
 clean:
 	$(RM) $(OBJS) *.so


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14069
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14069&view=rev
Author:   spiff_
Date:     2008-07-14 11:42:49 -0700 (Mon, 14 Jul 2008)

Log Message:
-----------
changed: compile ym codec instead of keeping binary in svn (linux x86)

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/StSoundLibrary.vcproj
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/XBMCYM.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Ym2149Ex.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/digidrum.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/license.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/readme.html

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/

Removed Paths:
-------------
    branches/linuxport/XBMC/system/players/paplayer/stsoundlibrary-i486-linux.so
    branches/linuxport/sources/paplayer/YMCodec/

Modified: branches/linuxport/XBMC/Makefile.in
===================================================================
--- branches/linuxport/XBMC/Makefile.in	2008-07-14 18:11:29 UTC (rev 14068)
+++ branches/linuxport/XBMC/Makefile.in	2008-07-14 18:42:49 UTC (rev 14069)
@@ -1,4 +1,4 @@
-DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec xbmc/cores/paplayer/WavPackCodec xbmc/cores/paplayer/GYMCodec xbmc/cores/paplayer/DCACodec
+DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec xbmc/cores/paplayer/WavPackCodec xbmc/cores/paplayer/GYMCodec xbmc/cores/paplayer/DCACodec xbmc/cores/paplayer/YMCodec
 
 LIBS=@LIBS@
 DEBUG_FLAGS=@DEBUG_FLAGS@
@@ -95,6 +95,7 @@
 	$(MAKE) -C xbmc/cores/paplayer/NSFCodec
 	$(MAKE) -C xbmc/cores/paplayer/SIDCodec
 	$(MAKE) -C xbmc/cores/paplayer/WavPackCodec
+	$(MAKE) -C xbmc/cores/paplayer/YMCodec
 	
 compile: guilib xbmc filesystem musicdatabase videodatabase cores paplayer dllloader exports xbox linux visualizations screensavers utils common tinyxml sqllite libscrobbler libgoahead unrarxlib libpython dvdplayer libupnp cdrip libcmyth librtmp papcodecs
 

Deleted: branches/linuxport/XBMC/system/players/paplayer/stsoundlibrary-i486-linux.so
===================================================================
(Binary files differ)

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec (from rev 14067, branches/linuxport/sources/paplayer/YMCodec)

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile
===================================================================
--- branches/linuxport/sources/paplayer/YMCodec/StSoundLibrary/Makefile	2008-07-14 12:05:16 UTC (rev 14067)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile	2008-07-14 18:42:49 UTC (rev 14069)
@@ -2,7 +2,7 @@
 OBJS=Depacker.o digidrum.o XBMCYM.o Ym2149Ex.o Ymload.o YmMusic.o YmUserInterface.o LZH/LZHXLIB.o
 
 stsoundlibrary-i486-linux.so: $(OBJS)
-	gcc -fPIC -shared -o $@ $(OBJS) `cat ../../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.def` ../../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.o
+	gcc -fPIC -shared -o $@ $(OBJS) `cat ../../../DllLoader/exports/wrapper.def` ../../../DllLoader/exports/wrapper.o && cp $@ ../../../../../system/players/paplayer/
 
 clean:
 	$(RM) $(OBJS) *.so

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/StSoundLibrary.vcproj
===================================================================
--- branches/linuxport/sources/paplayer/YMCodec/StSoundLibrary/StSoundLibrary.vcproj	2008-07-14 12:05:16 UTC (rev 14067)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/StSoundLibrary.vcproj	2008-07-14 18:42:49 UTC (rev 14069)
@@ -1,290 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="StSoundLibrary"
-	ProjectGUID="{D9885434-4B9D-41FB-B5FC-5E89D41AEFF0}"
-	SccProjectName="&quot;$/StSoundGPL/StSoundLibrary&quot;, IWAAAAAA"
-	SccLocalPath=".">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug/StSoundLibrary.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/StSoundLibrary.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="Depacker.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="digidrum.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\XBMCYM.cpp">
-			</File>
-			<File
-				RelativePath="Ym2149Ex.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Ymload.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="YmMusic.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="YmUserInterface.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<Filter
-				Name="LZH"
-				Filter="">
-				<File
-					RelativePath="LZH\LZH.H">
-				</File>
-				<File
-					RelativePath="LZH\LZHXLIB.C">
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							Optimization="0"
-							PreprocessorDefinitions=""
-							BasicRuntimeChecks="3"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							Optimization="2"
-							PreprocessorDefinitions=""/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="Depacker.h">
-			</File>
-			<File
-				RelativePath="digidrum.h">
-			</File>
-			<File
-				RelativePath="StSoundLibrary.h">
-			</File>
-			<File
-				RelativePath="Ym2149Ex.h">
-			</File>
-			<File
-				RelativePath="Ymload.h">
-			</File>
-			<File
-				RelativePath="YmMusic.h">
-			</File>
-			<File
-				RelativePath="YmTypes.h">
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\revision.txt">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/XBMCYM.cpp
===================================================================
--- branches/linuxport/sources/paplayer/YMCodec/StSoundLibrary/XBMCYM.cpp	2008-07-14 12:05:16 UTC (rev 14067)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/XBMCYM.cpp	2008-07-14 18:42:49 UTC (rev 14069)
@@ -1,74 +0,0 @@
-#include "StSoundLibrary.h"
-#include "YmMusic.h"
-
-#include <stdio.h>
-
-#ifdef __linux__
-#define __declspec(x)
-#endif
-
-extern "C"
-{ 
-  int __declspec(dllexport) DLL_LoadYM(const char* szFileName)
-  {
-    YMMUSIC *pMusic = ymMusicCreate();
-
-    if (ymMusicLoad(pMusic,szFileName))
-    {
-      ymMusicSetLoopMode(pMusic,YMFALSE);
-      ymMusicPlay(pMusic);
-      return (int)pMusic;
-    }
-  
-    ymMusicDestroy(pMusic);
-
-    return 0;
-  }
-
-  void __declspec(dllexport) DLL_FreeYM(int ym)
-  {
-    ymMusicStop((YMMUSIC*)ym);
-    ymMusicDestroy((YMMUSIC*)ym);
-  }
-
-  int __declspec(dllexport) DLL_FillBuffer(int ym, char* szBuffer, int iSize)
-  {
-    if (ymMusicCompute((YMMUSIC*)ym,(ymsample*)szBuffer,iSize/2))
-      return iSize;
-    else
-      return 0;
-  }
-
-  unsigned long __declspec(dllexport) DLL_Seek(int ym, unsigned long timepos)
-  {
-    if (ymMusicIsSeekable((YMMUSIC*)ym))
-    {
-      ymMusicSeek((YMMUSIC*)ym,timepos);
-      return timepos;
-    }
-
-    return 0;
-  }
-
-  const char __declspec(dllexport) *DLL_GetTitle(int ym)
-  {
-    ymMusicInfo_t info;
-    ymMusicGetInfo((YMMUSIC*)ym,&info);
-    return info.pSongName;
-  }
-
-  const char __declspec(dllexport) *DLL_GetArtist(int ym)
-  {
-    ymMusicInfo_t info;
-    ymMusicGetInfo((YMMUSIC*)ym,&info);
-    return info.pSongAuthor;
-  }
-
-  unsigned long __declspec(dllexport) DLL_GetLength(int ym)
-  {
-    ymMusicInfo_t info;
-    ymMusicGetInfo((YMMUSIC*)ym,&info);
-    return info.musicTimeInSec;
-  }
-}
-

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Ym2149Ex.cpp
===================================================================
--- branches/linuxport/sources/paplayer/YMCodec/StSoundLibrary/Ym2149Ex.cpp	2008-07-14 12:05:16 UTC (rev 14067)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Ym2149Ex.cpp	2008-07-14 18:42:49 UTC (rev 14069)
@@ -1,603 +0,0 @@
-/*-----------------------------------------------------------------------------
-
-	ST-Sound ( YM files player library )
-
-	Copyright (C) 1995-1999 Arnaud Carre ( http://leonard.oxg.free.fr )
-
-	Extended YM-2149 Emulator, with ATARI music demos effects.
-	(SID-Like, Digidrum, Sync Buzzer, Sinus SID and Pattern SID)
-
------------------------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------------------
-
-	This file is part of ST-Sound
-
-	ST-Sound is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
-
-	ST-Sound is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with ST-Sound; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
------------------------------------------------------------------------------*/
-
-#include "YmTypes.h"
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <stdio.h>
-#include "Ym2149Ex.h"
-
-//-------------------------------------------------------------------
-// env shapes.
-//-------------------------------------------------------------------
-static	const ymint		Env00xx[8]={ 1,0,0,0,0,0,0,0 };
-static	const ymint		Env01xx[8]={ 0,1,0,0,0,0,0,0 };
-static	const ymint		Env1000[8]={ 1,0,1,0,1,0,1,0 };
-static	const ymint		Env1001[8]={ 1,0,0,0,0,0,0,0 };
-static	const ymint		Env1010[8]={ 1,0,0,1,1,0,0,1 };
-static	const ymint		Env1011[8]={ 1,0,1,1,1,1,1,1 };
-static	const ymint		Env1100[8]={ 0,1,0,1,0,1,0,1 };
-static	const ymint		Env1101[8]={ 0,1,1,1,1,1,1,1 };
-static	const ymint		Env1110[8]={ 0,1,1,0,0,1,1,0 };
-static	const ymint		Env1111[8]={ 0,1,0,0,0,0,0,0 };
-static	const ymint *	EnvWave[16] = {	Env00xx,Env00xx,Env00xx,Env00xx,
-										Env01xx,Env01xx,Env01xx,Env01xx,
-										Env1000,Env1001,Env1010,Env1011,
-										Env1100,Env1101,Env1110,Env1111};
-
-static	ymint ymVolumeTable[16] =
-{	62,161,265,377,580,774,1155,1575,2260,3088,4570,6233,9330,13187,21220,32767};
-
-
-//----------------------------------------------------------------------
-// Very cool and fast DC Adjuster ! This is the *new* stuff of that
-// package coz I get that idea working on SainT in 2004 !
-// ( almost everything here is from 1995 !)
-//----------------------------------------------------------------------
-CDcAdjuster::CDcAdjuster()
-{
-	Reset();
-}
-
-void	CDcAdjuster::Reset(void)
-{
-	for (ymint i=0;i<DC_ADJUST_BUFFERLEN;i++)
-		m_buffer[i] = 0;
-
-	m_pos = 0;
-	m_sum = 0;
-}
-
-void	CDcAdjuster::AddSample(ymint sample)
-{
-	m_sum -= m_buffer[m_pos];
-	m_sum += sample;
-
-	m_buffer[m_pos] = sample;
-	m_pos = (m_pos+1)&(DC_ADJUST_BUFFERLEN-1);
-}
-
-
-
-
-//----------------------------------------------------------------------
-// Very simple low pass filter.
-// Filter coefs are 0.25,0.5,0.25
-//----------------------------------------------------------------------
-static	ymsample	*pInternalInput = NULL;
-static	yms32		internalInputLen = 0;
-static	ymsample	oldFilter[2] = {0,0};
-
-ymsample *getBufferCopy(ymsample *pIn,ymint len)
-{
-		if (len>internalInputLen)
-		{
-			if (pInternalInput) free(pInternalInput);
-			pInternalInput = (ymsample*)malloc(len*sizeof(ymsample));
-			internalInputLen = len;
-		}
-		memcpy(pInternalInput,pIn,len*sizeof(ymsample));
-		return pInternalInput;
-}
-
-#define	DSP_FILTER(a,b,c)	(((ymint)(a)+((ymint)b+(ymint)b)+(ymint)(c))>>2)
-
-
-// Cheap but efficient low pass filter ( 0.25,0.5,0.25 )
-// filter: out -> out
-void	lowpFilterProcess(ymsample *pOut,ymint len)		// private
-{
-ymsample *pIn;
-ymint i;
-
-		pIn = getBufferCopy(pOut,len);
-		if (len>0) *pOut++ = DSP_FILTER(oldFilter[0],oldFilter[1],pIn[0]);
-		if (len>1) *pOut++ = DSP_FILTER(oldFilter[1],pIn[0],pIn[1]);
-		oldFilter[0] = pIn[len-2];
-		oldFilter[1] = pIn[len-1];
-		for (i=2;i<len;i++)
-		{
-			*pOut++ = DSP_FILTER(pIn[0],pIn[1],pIn[2]);
-			pIn++;
-		}
-}
-
-
-
-static	ymu8 *ym2149EnvInit(ymu8 *pEnv,ymint a,ymint b)
-{
-ymint i;
-ymint d;
-
-		d = b-a;
-		a *= 15;
-		for (i=0;i<16;i++)
-		{
-			*pEnv++ = (ymu8)a;
-			a += d;
-		}
-		return pEnv;
-}
-
-
-CYm2149Ex::CYm2149Ex(ymu32 masterClock,ymint prediv,ymu32 playRate)
-{
-ymint i,env;
-
-
-		frameCycle = 0;
-		if (ymVolumeTable[15]==32767)		// excuse me for that bad trick ;-)
-		{
-			for (i=0;i<16;i++)
-			{
-				ymVolumeTable[i] = (ymVolumeTable[i]*2)/6;
-			}
-		}
-
-	//--------------------------------------------------------
-	// build env shapes.
-	//--------------------------------------------------------
-		ymu8 *pEnv = &envData[0][0][0];
-		for (env=0;env<16;env++)
-		{
-			const ymint *pse = EnvWave[env];
-			for (ymint phase=0;phase<4;phase++)
-			{
-				pEnv = ym2149EnvInit(pEnv,pse[phase*2+0],pse[phase*2+1]);
-			}
-		}
-
-		internalClock = masterClock/prediv;		// YM at 2Mhz on ATARI ST
-		replayFrequency = playRate;				// DAC at 44.1Khz on PC
-		cycleSample = 0;
-
-	// Set volume voice pointers.
-		pVolA = &volA;
-		pVolB = &volB;
-		pVolC = &volC;
-
-	// Reset YM2149
-		reset();
-
-
-}
-
-CYm2149Ex::~CYm2149Ex()
-{
-}
-
-void	CYm2149Ex::setClock(ymu32 _clock)
-{
-		internalClock = _clock;
-}
-
-
-ymu32 CYm2149Ex::toneStepCompute(ymint rHigh,ymint rLow)
-{
-
-	ymint per = rHigh&15;
-	per = (per<<8)+rLow;
-	if (per<=5) 
-	{
-		return 0;
-	}
-
-#ifdef YM_INTEGER_ONLY
-	yms64 step = internalClock;
-	step <<= (15+16-3);
-	step /= (per * replayFrequency);
-#else
-	ymfloat step = internalClock;
-	step /= ((ymfloat)per*8.0*(ymfloat)replayFrequency);
-	step *= 32768.0*65536.0;
-#endif
-	ymu32 istep = (ymu32)step;
-	return istep;
-}
-
-ymu32 CYm2149Ex::noiseStepCompute(ymint rNoise)
-{
-
-
-	ymint per = (rNoise&0x1f);
-	if (per<3)
-		return 0;
-
-#ifdef YM_INTEGER_ONLY
-	yms64 step = internalClock;
-	step <<= (16-1-3);
-	step /= (per * replayFrequency);
-#else
-	ymfloat step = internalClock;
-	step /= ((ymfloat)per*8.0*(ymfloat)replayFrequency);
-	step *= 65536.0/2.0;
-#endif
-
-	return (ymu32)step;
-}
-
-ymu32	CYm2149Ex::rndCompute(void)
-{
-		ymint	rBit = (rndRack&1) ^ ((rndRack>>2)&1);
-		rndRack = (rndRack>>1) | (rBit<<16);
-		return (rBit ? 0 : 0xffff);
-}
-
-ymu32 CYm2149Ex::envStepCompute(ymint rHigh,ymint rLow)
-{
-
-
-	ymint per = rHigh;
-	per = (per<<8)+rLow;
-	if (per<3)
-		return 0;
-
-#ifdef YM_INTEGER_ONLY
-	yms64 step = internalClock;
-	step <<= (16+16-9);
-	step /= (per * replayFrequency);
-#else
-	ymfloat step = internalClock;
-	step /= ((ymfloat)per*512.0*(ymfloat)replayFrequency);
-	step *= 65536.0*65536.0;
-#endif
-
-	return (ymu32)step;
-}
-
-
-void	CYm2149Ex::reset(void)
-{
-		writeRegister(7,0x3f);
-		writeRegister(8,0);
-		writeRegister(9,0);
-		writeRegister(10,0);
-		currentNoise = 0xffff;
-		rndRack = 1;
-		sidStop(0);
-		sidStop(1);
-		sidStop(2);
-
-		envShape = 0;
-		envPhase = 0;
-		envPos = 0;
-
-		m_dcAdjust.Reset();
-
-		memset(specialEffect,0,sizeof(specialEffect));
-
-		syncBuzzerStop();
-
-}
-
-
-void	CYm2149Ex::sidVolumeCompute(ymint voice,ymint *pVol)
-{
-
-		struct	YmSpecialEffect	*pVoice = specialEffect+voice;
-
-		if (pVoice->bSid)
-		{
-			if (pVoice->sidPos & (1<<31))
-				writeRegister(8+voice,pVoice->sidVol);
-			else
-				writeRegister(8+voice,0);
-		}
-		else if (pVoice->bDrum)
-		{
-//			writeRegister(8+voice,pVoice->drumData[pVoice->drumPos>>DRUM_PREC]>>4);
-
-			*pVol = (pVoice->drumData[pVoice->drumPos>>DRUM_PREC] * 255) / 6;
-
-			switch (voice)
-			{
-				case 0:
-					pVolA = &volA;
-					mixerTA = 0xffff;
-					mixerNA = 0xffff;
-					break;
-				case 1:
-					pVolB = &volB;
-					mixerTB = 0xffff;
-					mixerNB = 0xffff;
-					break;
-				case 2:
-					pVolC = &volC;
-					mixerTC = 0xffff;
-					mixerNC = 0xffff;
-					break;
-			}
-
-			pVoice->drumPos += pVoice->drumStep;
-			if ((pVoice->drumPos>>DRUM_PREC) >= pVoice->drumSize)
-			{
-				pVoice->bDrum = YMFALSE;
-			}
-
-		}
-}
-
-ymsample CYm2149Ex::nextSample(void)
-{
-ymint vol;
-ymint bt,bn;
-
-		if (noisePos&0xffff0000)
-		{
-			currentNoise ^= rndCompute();
-			noisePos &= 0xffff;
-		}
-		bn = currentNoise;
-
-		volE = ymVolumeTable[envData[envShape][envPhase][envPos>>(32-5)]];
-
-		sidVolumeCompute(0,&volA);
-		sidVolumeCompute(1,&volB);
-		sidVolumeCompute(2,&volC);
-
-	//---------------------------------------------------
-	// Tone+noise+env+DAC for three voices !
-	//---------------------------------------------------
-		bt = ((((yms32)posA)>>31) | mixerTA) & (bn | mixerNA);
-		vol  = (*pVolA)&bt;
-		bt = ((((yms32)posB)>>31) | mixerTB) & (bn | mixerNB);
-		vol += (*pVolB)&bt;
-		bt = ((((yms32)posC)>>31) | mixerTC) & (bn | mixerNC);
-		vol += (*pVolC)&bt;
-
-	//---------------------------------------------------
-	// Inc
-	//---------------------------------------------------
-		posA += stepA;
-		posB += stepB;
-		posC += stepC;
-		noisePos += noiseStep;
-		envPos += envStep;
-		if (0 == envPhase)
-		{
-			if (envPos<envStep)
-			{
-				envPhase = 1;
-			}
-		}
-
-		syncBuzzerPhase += syncBuzzerStep;
-		if (syncBuzzerPhase&(1<<31))
-		{
-			envPos = 0;
-			envPhase = 0;
-			syncBuzzerPhase &= 0x7fffffff;
-		}
-
-		specialEffect[0].sidPos += specialEffect[0].sidStep;
-		specialEffect[1].sidPos += specialEffect[1].sidStep;
-		specialEffect[2].sidPos += specialEffect[2].sidStep;
-
-	//---------------------------------------------------
-	// Normalize process
-	//---------------------------------------------------
-		m_dcAdjust.AddSample(vol);
-		return (vol - m_dcAdjust.GetDcLevel());
-}
-
-
-ymint		CYm2149Ex::readRegister(ymint reg)
-{
-		if ((reg>=0) && (reg<=13)) return registers[reg];
-		else return -1;
-}
-
-void	CYm2149Ex::writeRegister(ymint reg,ymint data)
-{
-
-		switch (reg)
-		{
-		case 0:
-			registers[0] = data&255;
-			stepA = toneStepCompute(registers[1],registers[0]);
-			if (!stepA) posA = (1<<31);		// Assume output always 1 if 0 period (for Digi-sample !)
-			break;
-
-		case 2:
-			registers[2] = data&255;
-			stepB = toneStepCompute(registers[3],registers[2]);
-			if (!stepB) posB = (1<<31);		// Assume output always 1 if 0 period (for Digi-sample !)
-			break;
-
-		case 4:
-			registers[4] = data&255;
-			stepC = toneStepCompute(registers[5],registers[4]);
-			if (!stepC) posC = (1<<31);		// Assume output always 1 if 0 period (for Digi-sample !)
-			break;
-
-		case 1:
-			registers[1] = data&15;
-			stepA = toneStepCompute(registers[1],registers[0]);
-			if (!stepA) posA = (1<<31);		// Assume output always 1 if 0 period (for Digi-sample !)
-			break;
-
-		case 3:
-			registers[3] = data&15;
-			stepB = toneStepCompute(registers[3],registers[2]);
-			if (!stepB) posB = (1<<31);		// Assume output always 1 if 0 period (for Digi-sample !)
-			break;
-
-		case 5:
-			registers[5] = data&15;
-			stepC = toneStepCompute(registers[5],registers[4]);
-			if (!stepC) posC = (1<<31);		// Assume output always 1 if 0 period (for Digi-sample !)
-			break;
-
-		case 6:
-			registers[6] = data&0x1f;
-			noiseStep = noiseStepCompute(registers[6]);
-			if (!noiseStep)
-			{
-				noisePos = 0;
-				currentNoise = 0xffff;
-			}
-			break;
-
-		case 7:
-			registers[7] = data&255;
-			mixerTA = (data&(1<<0)) ? 0xffff : 0;
-			mixerTB = (data&(1<<1)) ? 0xffff : 0;
-			mixerTC = (data&(1<<2)) ? 0xffff : 0;
-			mixerNA = (data&(1<<3)) ? 0xffff : 0;
-			mixerNB = (data&(1<<4)) ? 0xffff : 0;
-			mixerNC = (data&(1<<5)) ? 0xffff : 0;
-			break;
-
-		case 8:
-			registers[8] = data&31;
-			volA = ymVolumeTable[data&15];
-			if (data&0x10)
-				pVolA = &volE;
-			else
-				pVolA = &volA;
-			break;
-		
-		case 9:
-			registers[9] = data&31;
-			volB = ymVolumeTable[data&15];
-			if (data&0x10)
-				pVolB = &volE;
-			else
-				pVolB = &volB;
-			break;
-		
-		case 10:
-			registers[10] = data&31;
-			volC = ymVolumeTable[data&15];
-			if (data&0x10)
-				pVolC = &volE;
-			else
-				pVolC = &volC;
-			break;
-
-		case 11:
-			registers[11] = data&255;
-			envStep = envStepCompute(registers[12],registers[11]);
-			break;
-
-		case 12:
-			registers[12] = data&255;
-			envStep = envStepCompute(registers[12],registers[11]);
-			break;
-
-		case 13:
-			registers[13] = data&0xf;
-			envPos = 0;
-			envPhase = 0;
-			envShape = data&0xf;
-			break;
-
-		}
-}
-
-void	CYm2149Ex::update(ymsample *pSampleBuffer,ymint nbSample)
-{
-
-
-		ymsample *pBuffer = pSampleBuffer;
-		ymint	nbs = nbSample;
-
-
-		if (nbSample>0)
-		{
-			do
-			{
-				*pSampleBuffer++ = nextSample();
-			}
-			while (--nbSample);
-		}
-
-		lowpFilterProcess((ymsample*)pBuffer,nbs);
-
-}
-
-void	CYm2149Ex::drumStart(ymint voice,ymu8 *pDrumBuffer,ymu32 drumSize,ymint drumFreq)
-{
-	specialEffect[voice].drumData = pDrumBuffer;
-	specialEffect[voice].drumPos = 0;
-	specialEffect[voice].drumSize = drumSize;
-	specialEffect[voice].drumStep = (drumFreq<<DRUM_PREC)/replayFrequency;
-	specialEffect[voice].bDrum = YMTRUE;
-}
-
-void	CYm2149Ex::drumStop(ymint voice)
-{
-		specialEffect[voice].bDrum = YMFALSE;
-}
-
-void	CYm2149Ex::sidStart(ymint voice,ymint timerFreq,ymint vol)
-{
-#ifdef YM_INTEGER_ONLY
-		ymu32 tmp = timerFreq * ((1<<31) / replayFrequency);
-#else
-		ymfloat tmp = (ymfloat)timerFreq*((ymfloat)(1<<31))/(ymfloat)replayFrequency;
-#endif
-		specialEffect[voice].sidStep = (ymu32)tmp;
-		specialEffect[voice].sidVol = vol&15;
-		specialEffect[voice].bSid = YMTRUE;
-}
-
-void	CYm2149Ex::sidSinStart(ymint voice,ymint timerFreq,ymint vol)
-{
-	// TODO
-}
-
-void	CYm2149Ex::sidStop(ymint voice)
-{
-		specialEffect[voice].bSid = YMFALSE;
-}
-
-void	CYm2149Ex::syncBuzzerStart(ymint timerFreq,ymint _envShape)
-{
-#ifdef YM_INTEGER_ONLY
-		ymu32 tmp = timerFreq * ((1<<31) / replayFrequency);
-#else
-		ymfloat tmp = (ymfloat)timerFreq*((ymfloat)(1<<31))/(ymfloat)replayFrequency;
-#endif
-		envShape = envShape&15;
-		syncBuzzerStep = (ymu32)tmp;
-		syncBuzzerPhase = 0;
-		bSyncBuzzer = YMTRUE;
-}
-
-void	CYm2149Ex::syncBuzzerStop(void)
-{
-		bSyncBuzzer = YMFALSE;
-		syncBuzzerPhase = 0;
-		syncBuzzerStep = 0;
-}
-

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/digidrum.cpp
===================================================================
--- branches/linuxport/sources/paplayer/YMCodec/StSoundLibrary/digidrum.cpp	2008-07-14 12:05:16 UTC (rev 14067)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/digidrum.cpp	2008-07-14 18:42:49 UTC (rev 14069)
@@ -1,2584 +0,0 @@
-/*-----------------------------------------------------------------------------
-
-	ST-Sound ( YM files player library )
-
-	Copyright (C) 1995-1999 Arnaud Carre ( http://leonard.oxg.free.fr )
-
-	Sample datas of some common YM music. ( YM2 format )
-	YM3 or greater uses sample data inside the music file.
-	
------------------------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------------------
-
-	This file is part of ST-Sound
-
-	ST-Sound is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
-
-	ST-Sound is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with ST-Sound; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
------------------------------------------------------------------------------*/
-
-#include "YmTypes.h"
-
-static ymu8	sample00[631]={
-		0xCC,0x84,0xB4,0x70,0x90,0x94,0x70,0x80,0x80,0xAC,
-		0x58,0xFF,0x00,0x80,0x54,0x40,0x6C,0x78,0x94,0x7C,
-		0x8C,0x58,0x84,0x08,0x4C,0x54,0x78,0xA8,0xDC,0xDC,
-		0xFF,0xFF,0xF0,0xA4,0x70,0x44,0x3C,0x2C,0x14,0x00,
-		0x00,0x00,0x00,0x1C,0x90,0xE4,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xF4,0xB4,0x8C,0x44,0x08,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x28,0x70,0xDC,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC0,0x78,0x38,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x38,0x84,0xEC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xC0,0x84,0x50,0x18,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x04,0x50,0x98,0xDC,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xD8,0x8C,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x28,0x58,
-		0xA0,0xDC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xDC,0xC0,0x88,
-		0x58,0x1C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x40,
-		0x64,0x80,0xA8,0xD0,0xF8,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xE4,0xBC,0x8C,0x68,0x48,0x20,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x04,0x2C,0x60,0x78,0xA0,0xC4,0xF0,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEC,0xC4,0x98,0x64,
-		0x30,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x2C,0x50,
-		0x74,0x8C,0xB0,0xCC,0xE8,0xFC,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF8,
-		0xF0,0xDC,0xC8,0xBC,0xB0,0x90,0x80,0x70,0x5C,0x58,
-		0x48,0x38,0x38,0x28,0x24,0x1C,0x24,0x24,0x20,0x28,
-		0x38,0x48,0x58,0x50,0x50,0x5C,0x60,0x5C,0x5C,0x5C,
-		0x5C,0x60,0x5C,0x60,0x60,0x5C,0x54,0x5C,0x58,0x64,
-		0x68,0x64,0x64,0x6C,0x74,0x7C,0x78,0x80,0x88,0x90,
-		0x98,0x9C,0xA8,0xB8,0xB8,0xC0,0xC8,0xD0,0xD8,0xE0,
-		0xE0,0xE4,0xDC,0xD4,0xD8,0xDC,0xD0,0xCC,0xC0,0xC4,
-		0xBC,0xB0,0xA8,0x9C,0x98,0x94,0x90,0x7C,0x74,0x6C,
-		0x64,0x4C,0x40,0x30,0x20,0x18,0x08,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x0C,0x14,0x28,
-		0x34,0x44,0x50,0x64,0x74,0x84,0x98,0x98,0xAC,0xC0,
-		0xD0,0xD8,0xEC,0xF0,0xFC,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,0xD8,
-		0xD4,0xC8,0xBC,0x9C,0x8C,0x6C,0x74,0x50,0x40,0x34,
-		0x24,0x18,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x10,0x24,
-		0x38,0x4C,0x58,0x6C,0x80,0x90,0xA4,0xAC,0xBC,0xC8,
-		0xD8,0xE4,0xE4,0xEC,0xF0,0xF4,0xFC,0xFC,0xFC,0xF8,
-		0xFC,0xFC,0xF8,0xF8,0xF0,0xF0,0xEC,0xEC,0xE4,0xE0,
-		0xD8,0xD0,0xC4,0xBC,0xB0,0xA0,0x94,0x88,0x78,0x68,
-		0x58,0x44,0x38,0x30,0x24,0x20,0x14,0x0C,0x08,0x00,
-		0x00,0x00,0x04,0x0C,0x14,0x18,0x18,0x20,0x24,0x34,
-		0x38,0x40,0x48,0x50,0x5C,0x60,0x6C,0x70,0x74,0x80,
-		0x8C,0x90,0x98,0x9C,0xAC,0xB0,0xB8,0xC4,0xC0,0xBC,
-		0xC0,0xC8,0xD0,0xCC,0xC8,0xC4,0xC0,0xC0,0xC0,0xB4,
-		0xB4,0xAC,0xB0,0xA8,0xA4,0xA4,0x9C,0x98,0x94,0x94,
-		0x94,0x94,0x94,0x8C,0x80,0x80,0x74,0x74,0x70,0x64,
-		0x58,0x50,0x4C,0x4C,0x44,0x40,0x48,0x48,0x4C,0x4C,
-		0x4C,0x58,0x60,0x68,0x6C,0x6C,0x74,0x7C,0x7C,0x84,
-		0x84,0x88,0x8C,0x8C,0x88,0x88,0x84,0x84,0x84,0x7C,
-		0x78,0x70,0x6C,0x68,0x64,0x64,0x64,0x60,0x68,0x6C,
-		0x6C,0x70,0x7C,0x84,0x80,0x80,0x80,0x80,0x80,0x80,
-		0x80,};
-static ymu8	sample01[631]={
-		0x97,0x81,0x90,0x7B,0x84,0x86,0x7B,0x80,0x80,0x8D,
-		0x73,0xA7,0x58,0x80,0x72,0x6C,0x79,0x7D,0x86,0x7E,
-		0x83,0x73,0x81,0x5A,0x6F,0x72,0x7D,0x8C,0x9C,0x9C,
-		0xA7,0xA7,0xA2,0x8B,0x7B,0x6D,0x6A,0x65,0x5E,0x58,
-		0x58,0x58,0x58,0x60,0x84,0x9F,0xA7,0xA7,0xA7,0xA7,
-		0xA7,0xA7,0xA4,0x90,0x83,0x6D,0x5A,0x58,0x58,0x58,
-		0x58,0x58,0x58,0x58,0x58,0x64,0x7B,0x9C,0xA7,0xA7,
-		0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0x93,0x7D,0x69,0x58,
-		0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,
-		0x58,0x69,0x81,0xA1,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,
-		0xA7,0xA7,0xA7,0xA7,0xA7,0x93,0x81,0x71,0x5F,0x58,
-		0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,
-		0x58,0x58,0x59,0x71,0x87,0x9C,0xA7,0xA7,0xA7,0xA7,
-		0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,
-		0x9B,0x83,0x6D,0x58,0x58,0x58,0x58,0x58,0x58,0x58,
-		0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x64,0x73,
-		0x89,0x9C,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,
-		0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0x9C,0x93,0x82,
-		0x73,0x60,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,
-		0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x5F,0x6C,
-		0x77,0x80,0x8C,0x98,0xA5,0xA7,0xA7,0xA7,0xA7,0xA7,
-		0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,
-		0xA7,0x9F,0x92,0x83,0x78,0x6E,0x62,0x58,0x58,0x58,
-		0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,
-		0x58,0x58,0x58,0x59,0x65,0x76,0x7D,0x89,0x95,0xA2,
-		0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,
-		0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA1,0x95,0x87,0x77,
-		0x67,0x59,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,
-		0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x5B,0x65,0x71,
-		0x7C,0x83,0x8E,0x97,0xA0,0xA6,0xA7,0xA7,0xA7,0xA7,
-		0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA5,
-		0xA2,0x9C,0x96,0x92,0x8E,0x84,0x80,0x7B,0x74,0x73,
-		0x6E,0x69,0x69,0x64,0x63,0x60,0x63,0x63,0x62,0x64,
-		0x69,0x6E,0x73,0x71,0x71,0x74,0x76,0x74,0x74,0x74,
-		0x74,0x76,0x74,0x76,0x76,0x74,0x72,0x74,0x73,0x77,
-		0x78,0x77,0x77,0x79,0x7C,0x7E,0x7D,0x80,0x82,0x84,
-		0x87,0x88,0x8C,0x91,0x91,0x93,0x96,0x98,0x9B,0x9D,
-		0x9D,0x9F,0x9C,0x9A,0x9B,0x9C,0x98,0x97,0x93,0x95,
-		0x92,0x8E,0x8C,0x88,0x87,0x86,0x84,0x7E,0x7C,0x79,
-		0x77,0x6F,0x6C,0x67,0x62,0x5F,0x5A,0x58,0x58,0x58,
-		0x58,0x58,0x58,0x58,0x58,0x58,0x59,0x5B,0x5E,0x64,
-		0x68,0x6D,0x71,0x77,0x7C,0x81,0x87,0x87,0x8D,0x93,
-		0x98,0x9B,0xA1,0xA2,0xA6,0xA7,0xA7,0xA7,0xA7,0xA7,
-		0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA2,0x9B,
-		0x9A,0x96,0x92,0x88,0x83,0x79,0x7C,0x71,0x6C,0x68,
-		0x63,0x5F,0x5A,0x58,0x58,0x58,0x58,0x58,0x58,0x58,
-		0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x5A,0x5D,0x63,
-		0x69,0x6F,0x73,0x79,0x80,0x84,0x8B,0x8D,0x92,0x96,
-		0x9B,0x9F,0x9F,0xA1,0xA2,0xA4,0xA6,0xA6,0xA6,0xA5,
-		0xA6,0xA6,0xA5,0xA5,0xA2,0xA2,0xA1,0xA1,0x9F,0x9D,
-		0x9B,0x98,0x95,0x92,0x8E,0x89,0x86,0x82,0x7D,0x78,
-		0x73,0x6D,0x69,0x67,0x63,0x62,0x5E,0x5B,0x5A,0x58,
-		0x58,0x58,0x59,0x5B,0x5E,0x5F,0x5F,0x62,0x63,0x68,
-		0x69,0x6C,0x6E,0x71,0x74,0x76,0x79,0x7B,0x7C,0x80,
-		0x83,0x84,0x87,0x88,0x8D,0x8E,0x91,0x95,0x93,0x92,
-		0x93,0x96,0x98,0x97,0x96,0x95,0x93,0x93,0x93,0x90,
-		0x90,0x8D,0x8E,0x8C,0x8B,0x8B,0x88,0x87,0x86,0x86,
-		0x86,0x86,0x86,0x83,0x80,0x80,0x7C,0x7C,0x7B,0x77,
-		0x73,0x71,0x6F,0x6F,0x6D,0x6C,0x6E,0x6E,0x6F,0x6F,
-		0x6F,0x73,0x76,0x78,0x79,0x79,0x7C,0x7E,0x7E,0x81,
-		0x81,0x82,0x83,0x83,0x82,0x82,0x81,0x81,0x81,0x7E,
-		0x7D,0x7B,0x79,0x78,0x77,0x77,0x77,0x76,0x78,0x79,
-		0x79,0x7B,0x7E,0x81,0x80,0x80,0x80,0x80,0x80,0x80,
-		0x80,};
-static ymu8	sample02[490]={
-		0x74,0xB4,0x96,0x64,0x3C,0x00,0x1E,0x70,0x00,0x40,
-		0xF9,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xCA,0x4C,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0A,0xDB,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xE4,0x5A,0x16,0x24,0x02,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x28,0xC4,
-		0xEF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xED,0xFF,0x4A,0x06,0x1A,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x1E,0x84,0xBA,0xBE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFD,0xF9,0x6E,0x00,0x3A,0x0C,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x96,
-		0x8A,0x58,0x60,0xDD,0xB3,0x40,0xFF,0xF3,0x90,0xFD,
-		0xEF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE9,
-		0x8A,0xEB,0xB9,0x44,0x04,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x08,0x50,0x14,0x36,0xFD,0xD3,0xD9,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xAD,0xCF,
-		0xF5,0x92,0xFD,0xC2,0x10,0xA6,0x24,0x06,0x14,0x00,
-		0x00,0x00,0x00,0x00,0x1C,0x00,0x72,0x18,0x6A,0xF1,
-		0x80,0xFF,0xFF,0xFF,0xFF,0xF9,0xFF,0xF3,0xAA,0x88,
-		0xA8,0xAA,0x8C,0x1A,0xCA,0x50,0xB9,0x00,0xD9,0x5E,
-		0xA2,0x24,0x30,0x80,0x30,0x2E,0x00,0x0C,0x5E,0x06,
-		0x08,0x70,0x58,0x00,0x9E,0xFD,0xA8,0xFF,0xFF,0xF7,
-		0xFF,0xF5,0xFF,0xF5,0xFB,0xD5,0x70,0xC8,0xB6,0xA2,
-		0x36,0xC3,0x00,0x72,0x30,0x2E,0x00,0x3E,0x30,0x2E,
-		0x1C,0x74,0x56,0x32,0x5C,0xD5,0x9C,0x74,0xD0,0xDB,
-		0xB5,0xB9,0xCB,0x9E,0xE0,0xFF,0x90,0xCC,0x98,0xE9,
-		0x72,0xB4,0xB8,0x60,0xAE,0x6C,0x0C,0x44,0x4A,0x3C,
-		0x36,0x60,0x10,0x2C,0x88,0x02,0x88,0x60,0x92,0x94,
-		0xE1,0x6E,0xC4,0xE7,0xF7,0xF3,0x7A,0xCB,0xD0,0xAA,
-		0x6E,0xC4,0xCD,0xB6,0x6A,0x90,0x44,0x34,0x5A,0x20,
-		0x58,0x10,0x40,0x22,0x10,0x38,0x4A,0x42,0x5A,0x74,
-		0x42,0x92,0xC6,0xBE,0xE1,0xDF,0xE7,0xFF,0xF5,0xD5,
-		0xB1,0xC8,0xCA,0xD5,0x6E,0x6A,0x8A,0x40,0x52,0x22,
-		0x72,0x48,0x44,0x3E,0x92,0x82,0x66,0xD2,0x88,0xD2,
-		0xAC,0xA0,0x84,0x8A,0x8C,0x94,0xA3,0x86,0xE3,0x90,
-		0x7A,0xE1,0x8E,0xE7,0xAC,0x7C,0xAC,0xCD,0x86,0x7A,
-		0xA4,0x80,0x9A,0x3A,0x76,0x86,0x4E,0x50,0x94,0x4C,
-		0x32,0x9E,0x70,0xA0,0x72,0x74,0x56,0xAE,0xB8,0x80,
-		0xCA,0x82,0xA4,0x7C,0xEA,0xAA,0x84,0x32,0xD5,0xA2,
-		0x9A,0x50,0x4A,0x6A,0x28,0x9A,0x18,0x16,0x78,0x82,
-		0x94,0x94,0x9C,0x92,0x8E,0x7E,0x72,0x5A,0x88,0x44,
-		0x98,0xA8,0x64,0xA0,0x66,0xA6,0x84,0x7E,0x8C,0x92,
-		0xBC,0x92,0xB6,0x92,0xAA,0x5A,0x70,0x7A,0x66,0x7E,
-		0x4E,0x62,0xAE,0x6A,0x82,0x84,0x54,0x88,0x80,0x94,
-		0x78,0xBE,0xAC,0xA2,0xE1,0x8E,0xDD,0xD6,0xA6,0xAA,
-		0x60,0xA2,0x86,0x90,0x78,0x5C,0x94,0x72,0x54,0xB2,
-		0x6A,0x74,0x60,0x90,0x78,0x5A,0x9A,0x70,0x8C,0xA2,
-		0x64,0x4C,0xA8,0x80,0x80,0x80,0x80,0x80,0x80,0x80,};
-static ymu8	sample03[490]={
-		0x7C,0x90,0x86,0x77,0x6A,0x58,0x61,0x7B,0x58,0x6C,
-		0xA5,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0x97,0x6F,0x58,
-		0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x5B,0x9C,0xA7,
-		0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,
-		0xA7,0x9F,0x74,0x5E,0x63,0x58,0x58,0x58,0x58,0x58,
-		0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x64,0x95,
-		0xA2,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,
-		0xA7,0xA7,0xA2,0xA7,0x6F,0x59,0x60,0x58,0x58,0x58,
-		0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,
-		0x61,0x81,0x92,0x93,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,
-		0xA7,0xA7,0xA7,0xA7,0xA7,0xA5,0x7A,0x58,0x6A,0x5B,
-		0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x86,
-		0x83,0x73,0x76,0x9D,0x8F,0x6C,0xA7,0xA3,0x84,0xA7,
-		0xA2,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA0,
-		0x83,0xA1,0x91,0x6D,0x59,0x58,0x58,0x58,0x58,0x58,
-		0x58,0x58,0x58,0x5A,0x71,0x5E,0x68,0xA7,0x99,0x9B,
-		0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0xA7,0x8E,0x98,
-		0xA4,0x85,0xA7,0x94,0x5D,0x8B,0x63,0x59,0x5E,0x58,
-		0x58,0x58,0x58,0x58,0x60,0x58,0x7B,0x5F,0x79,0xA3,
-		0x80,0xA7,0xA7,0xA7,0xA7,0xA5,0xA7,0xA3,0x8D,0x82,
-		0x8C,0x8D,0x83,0x60,0x97,0x71,0x91,0x58,0x9B,0x75,
-		0x8A,0x63,0x67,0x80,0x67,0x66,0x58,0x5B,0x75,0x59,
-		0x5A,0x7B,0x73,0x58,0x89,0xA7,0x8C,0xA7,0xA7,0xA5,
-		0xA7,0xA4,0xA7,0xA4,0xA6,0x9A,0x7B,0x96,0x90,0x8A,
-		0x68,0x94,0x58,0x7B,0x67,0x66,0x58,0x6B,0x67,0x66,
-		0x60,0x7C,0x72,0x67,0x74,0x9A,0x88,0x7C,0x98,0x9C,
-		0x90,0x91,0x97,0x89,0x9D,0xA7,0x84,0x97,0x87,0xA0,
-		0x7B,0x90,0x91,0x76,0x8E,0x79,0x5B,0x6D,0x6F,0x6A,
-		0x68,0x76,0x5D,0x65,0x82,0x58,0x82,0x76,0x85,0x86,
-		0x9E,0x7A,0x95,0xA0,0xA5,0xA3,0x7E,0x97,0x98,0x8D,
-		0x7A,0x95,0x98,0x90,0x79,0x84,0x6D,0x68,0x74,0x62,
-		0x73,0x5D,0x6C,0x62,0x5D,0x69,0x6F,0x6C,0x74,0x7C,
-		0x6C,0x85,0x95,0x93,0x9E,0x9D,0xA0,0xA7,0xA4,0x9A,
-		0x8F,0x96,0x97,0x9A,0x7A,0x79,0x83,0x6C,0x71,0x62,
-		0x7B,0x6E,0x6D,0x6B,0x85,0x80,0x77,0x99,0x82,0x99,
-		0x8D,0x89,0x81,0x83,0x83,0x86,0x8A,0x81,0x9E,0x84,
-		0x7E,0x9E,0x84,0xA0,0x8D,0x7E,0x8D,0x98,0x81,0x7E,
-		0x8B,0x80,0x88,0x6A,0x7C,0x81,0x70,0x71,0x86,0x6F,
-		0x67,0x89,0x7B,0x89,0x7B,0x7C,0x72,0x8E,0x91,0x80,
-		0x97,0x80,0x8B,0x7E,0xA1,0x8D,0x81,0x67,0x9A,0x8A,
-		0x88,0x71,0x6F,0x79,0x64,0x88,0x5F,0x5E,0x7D,0x80,
-		0x86,0x86,0x88,0x85,0x84,0x80,0x7B,0x74,0x82,0x6D,
-		0x87,0x8C,0x77,0x89,0x77,0x8B,0x81,0x80,0x83,0x85,
-		0x92,0x85,0x90,0x85,0x8D,0x74,0x7B,0x7E,0x77,0x80,
-		0x70,0x76,0x8E,0x79,0x80,0x81,0x72,0x82,0x80,0x86,
-		0x7D,0x93,0x8D,0x8A,0x9E,0x84,0x9D,0x9A,0x8B,0x8D,
-		0x76,0x8A,0x81,0x84,0x7D,0x74,0x86,0x7B,0x72,0x8F,
-		0x79,0x7C,0x76,0x84,0x7D,0x74,0x88,0x7B,0x83,0x8A,
-		0x77,0x6F,0x8C,0x80,0x80,0x80,0x80,0x80,0x80,0x80,};
-static ymu8	sample04[699]={
-		0x80,0x80,0x80,0x80,0x80,0x80,0x90,0x94,0x94,0xE0,
-		0x28,0xC0,0x00,0x34,0xFF,0xA4,0xFF,0x78,0xE4,0xC0,
-		0x98,0x70,0xFF,0x30,0x7C,0x28,0x58,0x00,0xFF,0x00,
-		0xFF,0x00,0x00,0x5C,0x64,0x00,0x94,0x38,0x00,0x8C,
-		0x00,0x00,0x00,0x50,0x48,0x4C,0xBC,0xC8,0xF8,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0x9C,0xF8,0x44,0x3C,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x28,0x38,
-		0x18,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xB8,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x68,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xCC,0x7C,0x38,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x4C,
-		0x88,0xE8,0xE4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xE8,0xAC,0x48,0x24,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,
-		0x3C,0x7C,0x98,0xD4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xEC,0xC8,0xB4,0x9C,0x68,0x60,0x40,0x34,0x2C,
-		0x0C,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x08,0x1C,0x1C,
-		0x20,0x50,0x58,0x64,0x7C,0x98,0x7C,0x90,0xA0,0xB4,
-		0xC0,0xB8,0xC8,0xDC,0xE4,0xF0,0xDC,0xF4,0xF0,0xFC,
-		0xFF,0xF0,0xF4,0xEC,0xE8,0xEC,0xE4,0xDC,0xF4,0xDC,
-		0xD8,0xE4,0xCC,0xD8,0xCC,0xBC,0xA0,0xAC,0xA0,0xB4,
-		0xA4,0xA4,0xA8,0x9C,0x90,0x84,0x74,0x64,0x6C,0x58,
-		0x68,0x5C,0x5C,0x54,0x4C,0x40,0x4C,0x40,0x20,0x34,
-		0x20,0x14,0x20,0x20,0x10,0x1C,0x18,0x18,0x18,0x18,
-		0x20,0x20,0x18,0x18,0x28,0x24,0x38,0x40,0x34,0x3C,
-		0x4C,0x48,0x50,0x48,0x50,0x58,0x68,0x68,0x70,0x74,
-		0x74,0x84,0x88,0x94,0x90,0x90,0x98,0xA0,0xA4,0xAC,
-		0xA8,0xB8,0xB0,0xB4,0xB8,0xA8,0xB4,0xB8,0xB4,0xBC,
-		0xC0,0xB4,0xB4,0xC4,0xC8,0xC8,0xC0,0xD0,0xBC,0xCC,
-		0xC8,0xCC,0xCC,0xE0,0xD0,0xD8,0xDC,0xDC,0xE8,0xEC,
-		0xEC,0xE0,0xDC,0xE0,0xD8,0xE0,0xDC,0xD0,0xC8,0xC8,
-		0xC8,0xC8,0xBC,0xB4,0xB4,0xA0,0x98,0x88,0x8C,0x8C,
-		0x80,0x7C,0x78,0x68,0x5C,0x5C,0x4C,0x48,0x40,0x40,
-		0x34,0x34,0x34,0x34,0x2C,0x28,0x24,0x18,0x20,0x14,
-		0x18,0x20,0x18,0x24,0x1C,0x18,0x28,0x1C,0x2C,0x2C,
-		0x2C,0x3C,0x38,0x30,0x40,0x38,0x44,0x48,0x4C,0x48,
-		0x54,0x50,0x5C,0x64,0x64,0x70,0x68,0x70,0x78,0x84,
-		0x84,0x88,0x98,0x9C,0xAC,0xAC,0xAC,0xAC,0xB4,0xA8,
-		0xC4,0xC4,0xBC,0xCC,0xC8,0xC0,0xC0,0xB8,0xB4,0xB4,
-		0xB4,0xB0,0xB4,0xA8,0xA8,0xA0,0x94,0x94,0x8C,0x88,
-		0x88,0x88,0x80,0x7C,0x78,0x70,0x6C,0x64,0x60,0x60,
-		0x5C,0x5C,0x54,0x54,0x4C,0x48,0x40,0x40,0x40,0x3C,
-		0x44,0x40,0x40,0x48,0x40,0x40,0x44,0x44,0x48,0x4C,
-		0x58,0x60,0x5C,0x64,0x64,0x6C,0x6C,0x70,0x6C,0x70,
-		0x78,0x88,0x80,0x80,0x80,0x80,0x80,0x80,0x80,};
-static ymu8	sample05[505]={
-		0x9F,0x74,0x71,0x47,0x4D,0x63,0x2C,0x2F,0x80,0x99,
-		0xD9,0xC3,0xFA,0xB3,0xA7,0xA1,0x94,0x95,0x5A,0x69,
-		0x02,0x29,0x0B,0x13,0x00,0x0B,0x0A,0x03,0x00,0x41,
-		0x92,0xC4,0xE5,0xFF,0xFF,0xFF,0xEB,0x93,0xF9,0xB4,
-		0xC3,0xFF,0xFF,0xFB,0xDD,0xF4,0xD7,0x88,0x52,0x22,
-		0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x4A,0x9E,0xE8,0xFF,0xFF,0xF9,0xFF,0xE1,
-		0xFF,0xFC,0xFF,0xFE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFB,0xAA,0x7E,0x0E,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x09,0x1A,0x28,0x15,0x2D,0x23,0x15,0x0E,0x17,
-		0x17,0x24,0x38,0x36,0xA0,0x75,0x95,0x96,0x8F,0x90,
-		0x5B,0x4F,0x00,0x00,0x00,0x00,0x26,0x5E,0xA2,0xC7,
-		0xEF,0xFE,0xFF,0xFF,0xFA,0xFF,0xF9,0xE3,0xFA,0xD7,
-		0xFE,0x83,0x93,0xA1,0xC7,0x73,0xFF,0xDE,0xEC,0xFE,
-		0xCF,0xB5,0x89,0x8A,0x51,0x95,0x42,0x9E,0x7B,0x84,
-		0x93,0x8C,0x5C,0xA3,0x5C,0x46,0x16,0x0C,0x33,0x02,
-		0x73,0x10,0x1A,0x00,0x2B,0x00,0x48,0x22,0x73,0x52,
-		0x83,0xB2,0xA0,0x5C,0xB5,0x54,0x38,0x3D,0x00,0x0B,
-		0x2A,0x14,0x1D,0x2B,0x07,0x0F,0x2B,0x16,0x26,0x4A,
-		0x80,0xE2,0xDE,0xFE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFD,0xFF,0xFF,0xFA,0xFE,0xFF,0xFA,
-		0xFF,0xFA,0xFB,0xF7,0x80,0x4E,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x20,0x00,0x1B,0x1B,0x2C,0x1E,0x3D,0x44,0x56,0x52,
-		0x77,0x84,0x8B,0x8A,0x92,0x8D,0xBA,0xE8,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xF8,0xE0,0xD6,0xB4,0x7C,0x8A,
-		0x33,0x4B,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,
-		0x2A,0x52,0x1C,0x6B,0x5B,0x7A,0xAC,0xAD,0xA8,0xE2,
-		0xA7,0xD9,0x90,0xD1,0x95,0xD4,0x8A,0xD2,0xB6,0xE4,
-		0xEA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEA,0xF9,
-		0xC8,0x95,0x4F,0x3E,0x0F,0x00,0x09,0x02,0x03,0x00,
-		0x29,0x05,0x12,0x17,0x0C,0x08,0x17,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x2A,0x22,0x40,
-		0x47,0x93,0x64,0x9B,0xAC,0xB5,0xF2,0xD7,0xFD,0xFE,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA7,0xF9,0xC6,
-		0xB3,0xE4,0xAA,0xBA,0x97,0xA6,0x44,0x60,0x1C,0x14,
-		0x47,0x10,0x05,0x00,0x00,0x00,0x1C,0x07,0x00,0x0B,
-		0x23,0x35,0x61,0x66,0xA6,0xA4,0x96,0x8E,0xA6,0xB0,
-		0x5D,0xBD,0x7D,0x7C,0x57,0x77,0x52,0x62,0x69,0x6E,
-		0x7B,0x62,0x97,0x80,0xA1,0x92,0xC2,0xA9,0xB0,0xC7,
-		0xFC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xF3,0xE7,0xC8,0xCB,0x91,0xAC,0x7D,0x67,
-		0x41,0x30,0x04,0x00,0x00,0x00,0x00,0x00,0x09,0x00,
-		0x00,0x34,0x0C,0x1E,0x34,0x1F,0x25,0x2B,0x18,0x12,
-		0x09,0x1B,0x00,0x16,0x0F,0x39,0x1E,0x40,0x49,0x55,
-		0x6E,0x7D,0x84,0xA2,0xBC,0xCA,0xC6,0xCA,0xC3,0xCA,
-		0xB4,0xD7,0xAC,0x86,0x9F,0x7E,0x89,0x81,0x80,0x80,
-		0x80,0x80,0x80,0x80,0x80,};
-static ymu8	sample06[727]={
-		0x8C,0x38,0x74,0xA4,0x64,0x98,0xD8,0x80,0x0C,0x44,
-		0xB0,0xB4,0xA4,0xA4,0x54,0x14,0x48,0x84,0xC4,0xF8,
-		0xFF,0x5C,0x00,0x00,0x5C,0xFF,0xFF,0x7C,0x8C,0x20,
-		0x00,0xA8,0xF8,0x68,0x2C,0x8C,0xB0,0x14,0x00,0x74,
-		0xFF,0xFF,0xE4,0x0C,0x00,0x60,0x5C,0x00,0x00,0x00,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0x9C,0x00,0x00,0x00,0x00,
-		0x00,0x14,0xF8,0xF4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0xA4,
-		0xFF,0xFF,0xFF,0xFF,0xA8,0x10,0x00,0x00,0x00,0x70,
-		0x8C,0x84,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFC,
-		0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,
-		0xE4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0x70,0xB4,0xE4,0x84,0x3C,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x84,0xBC,0xDC,
-		0xE8,0xE0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0x84,0x34,0x30,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x3C,0x34,0x58,0xAC,0x58,
-		0xCC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE4,0xFF,
-		0xFF,0xFF,0xFF,0x44,0x00,0x38,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x30,0xFF,0x38,0x00,0x00,
-		0xDC,0xFF,0xFF,0x98,0x7C,0xB8,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0x8C,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x6C,0x00,0x00,0x64,0x6C,0x08,0x48,
-		0x40,0x30,0x70,0x3C,0x68,0xFF,0x8C,0x1C,0x54,0x98,
-		0x8C,0xC8,0xFF,0xFF,0xFF,0xBC,0xFF,0xFF,0xFF,0xFF,
-		0x24,0x60,0xFF,0xF8,0x00,0x00,0x00,0x38,0x00,0x00,
-		0x40,0x00,0x00,0x34,0xFF,0xFF,0x14,0x0C,0xFF,0x8C,
-		0x00,0x10,0xFC,0xA8,0x54,0x00,0x68,0xFF,0xFF,0xFF,
-		0xD4,0xA8,0xFF,0xFF,0xFF,0x8C,0x40,0xFF,0xFF,0x00,
-		0x00,0x64,0x6C,0x00,0x00,0x00,0x00,0x00,0x38,0xF0,
-		0x40,0x00,0x24,0x84,0xA4,0x00,0x00,0x98,0xFF,0x08,
-		0x00,0xFF,0xFF,0xE4,0x94,0xFF,0xFF,0xFF,0x54,0xFF,
-		0xFF,0xFF,0xE8,0xFF,0x78,0x00,0x00,0xF8,0xFF,0x00,
-		0x00,0x70,0x3C,0x00,0x54,0x74,0x00,0x00,0x28,0xFF,
-		0xEC,0x00,0x00,0x44,0xFF,0xFF,0x94,0x30,0xA8,0xFF,
-		0xFF,0xFF,0x94,0xD8,0xFF,0xFF,0x80,0x00,0xBC,0xFF,
-		0x30,0x00,0x34,0xFF,0x30,0x00,0x00,0xC8,0xC4,0x64,
-		0x00,0x00,0xD4,0x74,0x00,0x00,0xDC,0xFC,0x00,0x00,
-		0x00,0xFF,0xFF,0x14,0x00,0xFF,0xFF,0xFF,0xD8,0xFF,
-		0xFF,0xFC,0xD8,0x5C,0x00,0x40,0xFF,0xFF,0x00,0x00,
-		0x00,0xE4,0xFF,0x1C,0x00,0x7C,0xFF,0xA4,0x00,0x54,
-		0xFF,0x08,0x00,0x00,0x3C,0x04,0x98,0x18,0x18,0xF0,
-		0xFF,0xFF,0x14,0x4C,0xFF,0xFF,0xE4,0x14,0x00,0xA8,
-		0xFF,0xFF,0x00,0x00,0x38,0xFF,0xFF,0x20,0x00,0xC4,
-		0xFF,0x5C,0xA8,0xB0,0x28,0x50,0xFF,0x90,0x00,0x00,
-		0xF8,0xA4,0x00,0x00,0x10,0xB0,0xCC,0xC4,0xFF,0xFF,
-		0xEC,0x7C,0xFF,0xFF,0x98,0x9C,0xFF,0x8C,0x00,0x00,
-		0xFF,0xFF,0x84,0x00,0x30,0xFF,0xFC,0x04,0x08,0xD0,
-		0x90,0x00,0x00,0x44,0xB4,0x20,0x00,0x00,0x5C,0xF0,
-		0x58,0x1C,0xFF,0xFF,0xFF,0x70,0x50,0xFF,0xFF,0xFF,
-		0xC0,0x88,0x40,0x20,0xF4,0xFF,0x14,0x00,0x00,0x0C,
-		0x7C,0xA0,0x68,0x00,0x00,0x40,0x94,0x38,0xA0,0x60,
-		0x00,0x24,0xFF,0xF0,0x00,0x00,0x38,0xFF,0xFF,0x8C,
-		0x2C,0x64,0xFF,0xFF,0xA4,0xD4,0x8C,0x00,0x2C,0xE4,
-		0x8C,0x70,0x6C,0x00,0x44,0xA8,0x68,0x78,0xFF,0xEC,
-		0x00,0x00,0xF0,0xFF,0x84,0x10,0x00,0x6C,0xFF,0x30,
-		0x00,0xDC,0xFF,0x1C,0x08,0xFF,0xFF,0xA4,0x00,0x50,
-		0xFF,0xD8,0x24,0x60,0xFC,0x70,0x00,0x64,0xFF,0xC0,
-		0x00,0x0C,0xFF,0xEC,0xFF,0xFF,0x30,0x00,0xC4,0xFF,
-		0x00,0x1C,0xE0,0x40,0x00,0x70,0xC0,0x9C,0x00,0x00,
-		0xD4,0xFF,0x7C,0x00,0x3C,0xFF,0xD4,0x00,0x0C,0xFF,
-		0xD4,0x00,0x10,0xF0,0xFF,0x14,0x00,0xFF,0xDC,0x74,
-		0xFF,0xFF,0x10,0x00,0xFF,0xFF,0x00,0x00,0xC8,0xA4,
-		0x00,0x34,0xD8,0xB8,0x00,0x00,0xA0,0xFF,0x78,0x00,
-		0x68,0xFF,0x80,0x00,0xBC,0xBC,0x5C,0xB4,0x08,0x00,
-		0xDC,0xFF,0x88,0x00,0x84,0xFF,0xA4,0x14,0x84,0x68,
-		0x5C,0x10,0x00,0x70,0x34,0x00,0x00,0xC8,0xEC,0x40,
-		0x00,0x00,0xD8,0xFF,0xFF,0x40,0x70,0xA0,0x78,0xDC,
-		0xFF,0xE4,0x00,0x58,0xE8,0xFF,0xFF,0x94,0x18,0x70,
-		0xFF,0xFF,0x98,0x00,0x8C,0xB4,0x20,0x14,0xBC,0xFF,
-		0x48,0x00,0x00,0xFF,0xFF,0x00,0x00,0x94,0xFF,0xD0,
-		0x00,0x1C,0xFF,0xFF,0x38,0x00,0xBC,0xFF,0x44,0x38,
-		0x80,0x80,0x80,0x80,0x80,0x80,0x80,};
-static ymu8	sample07[480]={
-		0x3E,0xFD,0x13,0xFA,0x18,0xD5,0x1D,0xC1,0xC3,0xB5,
-		0xE7,0x6F,0xDF,0x01,0xFF,0x70,0xAD,0xE9,0x27,0xEB,
-		0x9F,0x2B,0xFD,0x38,0xB2,0xD9,0x0D,0xFF,0x4C,0x3B,
-		0xFB,0x00,0xD3,0x9D,0x00,0xD3,0xDF,0x1C,0xED,0xCD,
-		0x00,0xCB,0xB2,0x00,0x86,0xCE,0x10,0x13,0xD1,0x85,
-		0x90,0x07,0xCD,0xE3,0x22,0x3D,0x8F,0x8A,0x33,0x7E,
-		0xB4,0x3A,0x45,0xCE,0xA7,0x3A,0x47,0xE9,0xAF,0x08,
-		0x49,0xAE,0xC0,0x4C,0x10,0x46,0xF1,0x38,0x03,0x89,
-		0xEF,0x6A,0x11,0xC7,0xF3,0x43,0x00,0x2D,0xE5,0xF1,
-		0x3E,0x00,0x17,0xA9,0xFF,0xEC,0x73,0x00,0x43,0xE5,
-		0xF3,0x72,0x28,0x57,0xFF,0xC7,0x4E,0x22,0x5F,0xF3,
-		0xFF,0xF1,0x65,0x0B,0x08,0xA9,0xFF,0xDF,0x66,0x24,
-		0x18,0xA7,0xC6,0x9C,0xDC,0x9D,0xA3,0x56,0x00,0x00,
-		0x63,0xD1,0xF8,0xFD,0x94,0x32,0x00,0x15,0x9E,0xF9,
-		0xFD,0x91,0x5E,0x02,0x01,0x23,0x5A,0xDA,0xFE,0xFE,
-		0xBC,0x3E,0x00,0x00,0x65,0xD6,0xFF,0xED,0xD8,0x4D,
-		0x02,0x00,0x00,0x28,0xAD,0xFF,0xFF,0xFF,0xDB,0x69,
-		0x29,0x00,0x01,0x00,0x03,0x8C,0xDF,0xFF,0xFF,0xFF,
-		0xD5,0xC7,0x0B,0x37,0x00,0x00,0x21,0x4B,0x85,0xB3,
-		0xB8,0xD0,0xFD,0x9E,0xBB,0xA2,0xE3,0xB1,0x60,0x25,
-		0x30,0x02,0x28,0x58,0x3D,0x69,0xE0,0xFF,0xFF,0xD5,
-		0x94,0x6D,0xA1,0x46,0x3C,0x00,0x00,0x00,0x04,0x79,
-		0xB9,0xBF,0xD2,0xFF,0xFF,0xFF,0xFF,0xC5,0x76,0x52,
-		0x5C,0x72,0x42,0x00,0x00,0x00,0x00,0x29,0x62,0xFF,
-		0xE5,0xFF,0xFF,0xFE,0xD6,0xFE,0xE8,0xBF,0x96,0x81,
-		0x79,0x62,0x2F,0x00,0x01,0x0E,0x1D,0x29,0x0D,0x27,
-		0x48,0x97,0xCB,0xE7,0xEC,0xF6,0xF1,0xFF,0xF5,0x9C,
-		0xA9,0xB2,0x9C,0x8A,0x6E,0x47,0x21,0x00,0x00,0x00,
-		0x00,0x02,0x1C,0x47,0x5D,0x70,0x79,0x87,0xBF,0xCA,
-		0xDF,0xDA,0xFD,0xFF,0xEF,0xFF,0xCF,0xF7,0xC5,0xDF,
-		0xB3,0x7C,0x13,0x03,0x01,0x50,0x00,0x00,0x00,0x00,
-		0x3C,0x69,0x82,0x65,0x62,0x71,0x8B,0x9D,0xBB,0x9F,
-		0x9E,0x99,0xBA,0xAD,0xB5,0xE3,0xD5,0xF1,0xB2,0x9F,
-		0x95,0x86,0x8F,0xBA,0xC9,0xDA,0xDA,0xDA,0x70,0x39,
-		0x4C,0x58,0x6F,0x52,0x29,0x00,0x00,0x2D,0x0B,0x00,
-		0x00,0x03,0x3F,0x82,0xA7,0xF5,0x98,0x99,0x8A,0xCD,
-		0xB0,0x9B,0xDD,0xFE,0xFF,0xFF,0xF1,0xBA,0x92,0x6C,
-		0x71,0x5A,0x91,0x4A,0x49,0x59,0x58,0x69,0x61,0x7A,
-		0x75,0x67,0x62,0x81,0x92,0xD9,0xD9,0x82,0x34,0x03,
-		0x28,0x3D,0x67,0x62,0x52,0x7B,0x6D,0x8F,0x90,0x81,
-		0x7D,0x84,0x9D,0xC0,0xCE,0xBE,0x9C,0x93,0xA5,0xBA,
-		0xA8,0xB7,0xAE,0x94,0x8F,0x82,0x6A,0x6D,0x51,0x5A,
-		0x5F,0x69,0x84,0x95,0x8B,0x85,0x74,0x78,0x7A,0xA0,
-		0x88,0x74,0x58,0x3B,0x34,0x09,0x00,0x00,0x0E,0x47,
-		0x7E,0x94,0x8B,0x74,0x61,0x7B,0x80,0x90,0x90,0xA0,
-		0xBD,0xCB,0xDA,0xC6,0xC1,0xA3,0x9F,0x92,0x98,0xA5,
-		0x9C,0xAB,0xB0,0xAB,0xA8,0x96,0xB7,0xB5,0xC7,0xA4,
-		0xB5,0xD0,0xD9,0x80,0x80,0x80,0x80,0x80,0x80,0x80,};
-static ymu8	sample08[2108]={
-		0x8A,0xAB,0x9D,0x3F,0x29,0x4A,0x68,0x97,0xF2,0x85,
-		0x90,0x6D,0x68,0x68,0x71,0x82,0x88,0xEB,0x9A,0x59,
-		0x30,0x00,0x33,0x41,0x84,0xA9,0xCC,0x92,0x81,0x60,
-		0x77,0x79,0x80,0x95,0xB6,0xDA,0x92,0x6B,0x45,0x2E,
-		0x02,0x51,0x63,0x8B,0xA1,0xA3,0xD6,0x92,0x92,0x83,
-		0x76,0x7D,0x7C,0x7C,0x8B,0x88,0x7D,0x92,0xD5,0xAC,
-		0x60,0x48,0x32,0x19,0x0C,0x49,0x5A,0x93,0x8D,0x93,
-		0xA7,0xD6,0x90,0x88,0x78,0x7D,0x75,0x8D,0x7E,0x7E,
-		0x8F,0x84,0x89,0x8B,0xE7,0xA9,0x61,0x53,0x36,0x28,
-		0x1B,0x4E,0x5E,0x7C,0xA0,0x99,0xA5,0xCC,0xA8,0x9A,
-		0x94,0x89,0x87,0x89,0x98,0x83,0x8C,0x8F,0x84,0x7A,
-		0x8E,0xD4,0xD3,0x58,0x48,0x24,0x24,0x06,0x47,0x4E,
-		0x82,0x97,0x89,0x9D,0xEC,0x83,0x95,0x8C,0x7C,0x7E,
-		0x89,0x89,0x76,0x86,0x87,0x78,0x89,0xA2,0x86,0xB9,
-		0x62,0x3D,0x1D,0x2D,0x10,0x4A,0x63,0x8A,0x98,0x98,
-		0xB1,0xF3,0xA0,0xA9,0x8D,0x87,0x93,0x92,0x8F,0x90,
-		0x94,0x90,0x81,0x8F,0xC8,0x54,0xA3,0x6A,0x36,0x28,
-		0x2C,0x2B,0x38,0x6B,0x90,0x96,0xA5,0xEB,0x96,0x8D,
-		0x81,0x7D,0x7D,0x89,0x8F,0x8F,0x87,0x91,0xB3,0xB1,
-		0x63,0x54,0x30,0x03,0x4A,0x49,0x6C,0x86,0xB7,0x80,
-		0x85,0x7C,0x69,0x80,0x79,0x89,0x89,0x95,0xBC,0xBE,
-		0x6F,0x60,0x3F,0x06,0x5B,0x60,0x83,0x9C,0xC3,0x93,
-		0x8B,0x86,0x6F,0x7A,0x7C,0x85,0x8E,0x97,0xBB,0xC5,
-		0x6A,0x5C,0x34,0x04,0x4E,0x4E,0x80,0x97,0xB9,0x90,
-		0x81,0x75,0x6A,0x73,0x7A,0x86,0x89,0x90,0xB5,0xBA,
-		0x63,0x58,0x40,0x06,0x55,0x5E,0x82,0x91,0xBC,0x92,
-		0x83,0x7D,0x69,0x7A,0x79,0x85,0x86,0x91,0xB8,0xB0,
-		0x62,0x65,0x45,0x08,0x53,0x5E,0x8A,0x9A,0xEE,0x8F,
-		0x86,0x6D,0x74,0x72,0x7E,0x88,0x92,0xC1,0xD6,0x70,
-		0x56,0x33,0x13,0x53,0x5D,0x8C,0x98,0xDF,0x89,0x7E,
-		0x66,0x70,0x79,0x79,0x87,0x8D,0xA3,0xC6,0x79,0x65,
-		0x40,0x13,0x57,0x59,0x75,0x8D,0xA3,0xB2,0x84,0x83,
-		0x6D,0x7A,0x81,0x80,0x8A,0x91,0xAA,0xCE,0x80,0x6C,
-		0x43,0x12,0x50,0x54,0x76,0x95,0xAA,0xB4,0x86,0x82,
-		0x67,0x6E,0x7A,0x80,0x90,0x90,0xA4,0xCA,0x77,0x69,
-		0x3F,0x0F,0x4E,0x5B,0x79,0x8E,0xA5,0xB7,0x87,0x82,
-		0x65,0x70,0x7A,0x83,0x85,0x92,0xA4,0xC5,0x7B,0x65,
-		0x43,0x1C,0x48,0x59,0x70,0x95,0x9D,0xF0,0x8A,0x8A,
-		0x70,0x70,0x7B,0x7C,0x8B,0x8D,0x90,0xA0,0xC6,0x81,
-		0x66,0x44,0x28,0x37,0x55,0x6C,0x93,0x98,0xDE,0x80,
-		0x88,0x71,0x74,0x79,0x76,0x8A,0x8A,0x90,0x90,0xEE,
-		0xCB,0x63,0x52,0x32,0x05,0x50,0x5F,0x7D,0x90,0x9C,
-		0xE7,0x80,0x8D,0x78,0x6B,0x77,0x7C,0x87,0x88,0x91,
-		0x92,0xB8,0xC4,0x66,0x56,0x37,0x2A,0x31,0x54,0x70,
-		0x92,0x8F,0xB2,0xBC,0x8E,0x8B,0x76,0x7E,0x7A,0x85,
-		0x8B,0x88,0x8F,0x98,0xDF,0xB9,0x6D,0x49,0x2A,0x07,
-		0x53,0x5C,0x80,0x95,0x97,0xEB,0x85,0x88,0x73,0x71,
-		0x78,0x75,0x83,0x92,0x90,0x8D,0xCD,0xC1,0x57,0x57,
-		0x3A,0x21,0x4A,0x5D,0x70,0x8B,0x9B,0xB0,0x8B,0x88,
-		0x84,0x70,0x78,0x82,0x86,0x85,0x90,0x8F,0x8F,0xA1,
-		0xC0,0x98,0x62,0x49,0x32,0x1A,0x4A,0x60,0x76,0x96,
-		0x98,0x9E,0xE4,0x8B,0x8B,0x7A,0x79,0x7D,0x7D,0x85,
-		0x86,0x85,0x85,0x89,0x8A,0xD1,0xB9,0x5C,0x3F,0x30,
-		0x26,0x2D,0x56,0x74,0x8C,0x95,0xA4,0xC8,0x8F,0x96,
-		0x84,0x79,0x81,0x80,0x88,0x89,0x8F,0x87,0x88,0x94,
-		0xEA,0xD8,0x65,0x4B,0x30,0x27,0x15,0x51,0x66,0x90,
-		0x91,0x99,0xB7,0xA6,0x97,0x8D,0x80,0x87,0x82,0x8C,
-		0x8A,0x86,0x88,0x85,0x83,0x9C,0xA8,0x90,0x52,0x43,
-		0x2F,0x24,0x20,0x5C,0x69,0x89,0x94,0x9B,0xA5,0xEC,
-		0x95,0x94,0x80,0x8A,0x80,0x83,0x8D,0x85,0x85,0x89,
-		0x87,0x85,0xC8,0xA8,0x5F,0x4C,0x3B,0x29,0x13,0x4C,
-		0x5A,0x73,0x92,0x98,0xA1,0xB2,0xBA,0x96,0x94,0x87,
-		0x88,0x84,0x8A,0x8B,0x82,0x84,0x88,0x80,0x7E,0x88,
-		0xE5,0xC2,0x5C,0x47,0x2F,0x2C,0x30,0x09,0x58,0x6D,
-		0x8D,0x93,0x9D,0xA9,0xAE,0xF5,0x9F,0x9F,0x87,0x8B,
-		0x87,0x84,0x86,0x85,0x7E,0x76,0x78,0x76,0x7A,0x83,
-		0xE2,0xBD,0x55,0x3E,0x2C,0x29,0x31,0x0E,0x5E,0x70,
-		0x8F,0x9D,0xA5,0xAC,0xB7,0xF3,0xA7,0xA7,0x8C,0x88,
-		0x85,0x7E,0x84,0x83,0x81,0x7D,0x7B,0x7B,0x75,0x80,
-		0xE7,0xB9,0x43,0x40,0x2C,0x28,0x2D,0x05,0x4E,0x69,
-		0x91,0x9A,0xA8,0xAD,0xAF,0xF7,0x99,0xA5,0x8D,0x89,
-		0x89,0x82,0x83,0x80,0x7B,0x7B,0x76,0x73,0x78,0x82,
-		0xDF,0x56,0x87,0x4D,0x27,0x2D,0x30,0x03,0x97,0x70,
-		0x80,0x96,0xAA,0xA8,0xAF,0xF2,0x6F,0xCB,0x90,0x83,
-		0x8D,0x80,0x88,0x84,0x80,0x80,0x78,0x71,0x79,0x7C,
-		0xC8,0x8F,0x93,0x26,0x37,0x22,0x2A,0x05,0x6B,0x56,
-		0x92,0x97,0xA7,0xAA,0xAE,0xEF,0xCA,0x7C,0xB3,0x71,
-		0x9C,0x77,0x94,0x81,0x81,0x7D,0x76,0x74,0x76,0x78,
-		0xB4,0xCD,0x81,0x35,0x18,0x34,0x1E,0x04,0x20,0xA9,
-		0x60,0xB0,0xB1,0xA2,0xB8,0xE5,0xF6,0x63,0xAA,0x98,
-		0x70,0x95,0x82,0x7C,0x84,0x7D,0x78,0x76,0x75,0x77,
-		0xA1,0xD9,0x8F,0x50,0x03,0x33,0x17,0x00,0x92,0x6B,
-		0x8B,0x9B,0xA5,0xAE,0xB4,0xD5,0xB2,0xA6,0x9F,0x87,
-		0x87,0x81,0x87,0x83,0x80,0x7D,0x80,0x7A,0x75,0x78,
-		0x78,0xC1,0x80,0x72,0x44,0x33,0x25,0x28,0x28,0x3C,
-		0x6C,0x7D,0x9F,0xA1,0xAA,0xB2,0xB3,0xEF,0xA1,0xA9,
-		0x8F,0x84,0x81,0x7D,0x7B,0x7D,0x7C,0x76,0x73,0x71,
-		0x6D,0x71,0x75,0x9A,0x79,0xA8,0x4F,0x3B,0x2B,0x32,
-		0x35,0x0E,0x6B,0x76,0x94,0xA7,0xAD,0xB8,0xB8,0xBF,
-		0xED,0xA8,0xAF,0x95,0x85,0x84,0x7B,0x7B,0x75,0x76,
-		0x6F,0x6A,0x6A,0x6A,0x6E,0x6D,0x74,0xD7,0x86,0x5A,
-		0x40,0x31,0x2E,0x3A,0x3A,0x1A,0x6D,0x7C,0x9E,0xA9,
-		0xB3,0xBA,0xBC,0xC0,0xF4,0xAD,0xAA,0x8D,0x84,0x7E,
-		0x79,0x77,0x74,0x74,0x6D,0x69,0x6B,0x69,0x6B,0x70,
-		0x77,0xD9,0x80,0x6D,0x43,0x36,0x31,0x38,0x3D,0x1E,
-		0x71,0x78,0x94,0xAF,0xB4,0xBD,0xBF,0xC3,0xC7,0xF5,
-		0xAE,0xA1,0x86,0x80,0x73,0x6F,0x6F,0x6E,0x67,0x65,
-		0x63,0x5F,0x63,0x69,0x68,0x6C,0x7D,0xB4,0xC4,0x50,
-		0x44,0x34,0x33,0x45,0x4B,0x11,0x77,0x85,0xA6,0xB4,
-		0xBD,0xBF,0xBF,0xC4,0xD3,0xBF,0xAC,0xA0,0x7D,0x7D,
-		0x74,0x6F,0x6C,0x69,0x66,0x62,0x60,0x63,0x63,0x6A,
-		0x6C,0x6D,0x8F,0x82,0xE0,0x2D,0x47,0x3E,0x34,0x42,
-		0x4F,0x0B,0x73,0x83,0xA7,0xAF,0xB8,0xBD,0xB9,0xBD,
-		0xBE,0xCC,0xCA,0xA1,0x92,0x73,0x6F,0x67,0x63,0x61,
-		0x64,0x60,0x5D,0x61,0x61,0x63,0x66,0x6B,0x72,0x73,
-		0x7E,0x95,0xA6,0xCA,0x60,0x4D,0x46,0x3F,0x4B,0x54,
-		0x5F,0x28,0x85,0x90,0xB2,0xB7,0xBE,0xC2,0xC0,0xBE,
-		0xBE,0xC7,0xC3,0x9A,0x8C,0x6D,0x66,0x5D,0x5B,0x58,
-		0x5A,0x58,0x55,0x56,0x58,0x5D,0x61,0x66,0x6D,0x73,
-		0x77,0x88,0xC2,0xBB,0x5D,0x5C,0x50,0x3F,0x4F,0x57,
-		0x5F,0x0E,0x87,0x92,0xB4,0xBF,0xC3,0xC6,0xC6,0xC5,
-		0xC3,0xCA,0xF7,0xA2,0x86,0x6B,0x69,0x62,0x5F,0x5D,
-		0x5B,0x5D,0x5A,0x57,0x59,0x5D,0x5E,0x66,0x71,0x71,
-		0x79,0x88,0xF7,0x3C,0xCB,0x1E,0x5B,0x32,0x46,0x4F,
-		0x54,0x1C,0x93,0x71,0xBA,0xAE,0xC0,0xC3,0xC1,0xC1,
-		0xC1,0xC6,0xFD,0x83,0x98,0x7B,0x56,0x73,0x50,0x64,
-		0x54,0x60,0x54,0x57,0x5E,0x5D,0x64,0x67,0x6D,0x73,
-		0x7A,0x84,0xDB,0xC1,0x9B,0x56,0x31,0x3E,0x3D,0x49,
-		0x57,0x65,0x25,0x8E,0xA0,0xBD,0xC3,0xCB,0xCA,0xC5,
-		0xC5,0xBF,0xB9,0xBA,0xED,0x91,0x82,0x61,0x57,0x4E,
-		0x4E,0x4F,0x4A,0x4E,0x4F,0x50,0x54,0x59,0x61,0x66,
-		0x6D,0x77,0x78,0x82,0x89,0x8E,0xBD,0x81,0xDA,0x5C,
-		0x58,0x52,0x4B,0x56,0x61,0x67,0x67,0x44,0x90,0x98,
-		0xB8,0xBD,0xC3,0xC2,0xC2,0xC1,0xB9,0xB7,0xB6,0xF1,
-		0x9D,0x8C,0x64,0x57,0x52,0x4D,0x4D,0x4C,0x4D,0x4B,
-		0x4F,0x55,0x56,0x5E,0x67,0x6A,0x72,0x79,0x80,0x85,
-		0x8B,0xB4,0x99,0xDA,0x7B,0x51,0x52,0x46,0x55,0x5C,
-		0x67,0x6C,0x0D,0xCC,0x8E,0xB2,0xC3,0xC2,0xC8,0xC5,
-		0xC5,0xC2,0xBB,0xBC,0xFA,0x65,0xAA,0x4F,0x63,0x48,
-		0x4D,0x4B,0x49,0x4A,0x4F,0x4E,0x51,0x59,0x5F,0x66,
-		0x6B,0x71,0x78,0x80,0x86,0x8E,0xA5,0xF4,0x79,0xA1,
-		0x5A,0x32,0x4E,0x54,0x52,0x62,0x6D,0x2A,0x6D,0xD1,
-		0x95,0xD0,0xC2,0xCD,0xC4,0xC2,0xC3,0xBD,0xBA,0xE0,
-		0x81,0x87,0x6A,0x55,0x53,0x47,0x49,0x4A,0x47,0x4A,
-		0x4E,0x51,0x59,0x5D,0x63,0x67,0x70,0x79,0x7E,0x85,
-		0x8B,0x8F,0x96,0xE6,0x86,0xDD,0x5F,0x5B,0x48,0x4A,
-		0x55,0x5D,0x68,0x6B,0x1E,0x8F,0x9A,0xB5,0xBE,0xC2,
-		0xC8,0xC3,0xC1,0xBD,0xB9,0xB5,0xB0,0xED,0x91,0x7E,
-		0x5A,0x51,0x46,0x46,0x46,0x45,0x49,0x4A,0x4E,0x53,
-		0x58,0x61,0x67,0x72,0x75,0x7D,0x86,0x8A,0x8E,0x93,
-		0x9D,0xEF,0x82,0xC2,0x3F,0x6F,0x48,0x55,0x5A,0x63,
-		0x6D,0x6D,0x15,0xC2,0x9A,0xAA,0xC1,0xC2,0xC4,0xC2,
-		0xBF,0xBA,0xB4,0xAF,0xAD,0xF6,0x40,0x96,0x3F,0x58,
-		0x43,0x45,0x44,0x47,0x47,0x48,0x4F,0x54,0x59,0x61,
-		0x68,0x6D,0x75,0x80,0x85,0x89,0x91,0x95,0xA0,0xF9,
-		0x7A,0xAE,0x70,0x3A,0x47,0x58,0x56,0x60,0x6F,0x6F,
-		0x1F,0xC4,0x7D,0xD7,0xC3,0xC4,0xCC,0xC7,0xC3,0xBF,
-		0xBB,0xAF,0xA8,0xA8,0xC3,0x76,0x68,0x45,0x3E,0x39,
-		0x37,0x37,0x39,0x42,0x43,0x47,0x51,0x59,0x60,0x6E,
-		0x77,0x7C,0x84,0x8A,0x8F,0x92,0x96,0x9B,0x9A,0x9E,
-		0xB8,0x84,0x95,0x9D,0x64,0x5A,0x48,0x55,0x56,0x63,
-		0x6F,0x73,0x77,0x2A,0x8C,0xA1,0xC2,0xC7,0xCB,0xCC,
-		0xC8,0xC0,0xBB,0xB6,0xAC,0x9F,0x99,0xC6,0x48,0x62,
-		0x53,0x3B,0x35,0x30,0x31,0x30,0x3A,0x3E,0x41,0x49,
-		0x53,0x5B,0x65,0x71,0x78,0x80,0x8A,0x90,0x92,0x97,
-		0x9D,0x9F,0x9F,0xA2,0xEA,0x6F,0xC7,0x94,0x39,0x70,
-		0x4B,0x58,0x61,0x63,0x76,0x77,0x6F,0x49,0xD3,0x8A,
-		0xDD,0xB7,0xD0,0xC6,0xC1,0xBE,0xB6,0xB1,0xA5,0x9C,
-		0x93,0xA0,0x70,0x61,0x4D,0x34,0x33,0x2C,0x2F,0x32,
-		0x36,0x3B,0x3E,0x48,0x52,0x5A,0x67,0x71,0x78,0x82,
-		0x89,0x91,0x96,0x9A,0x9F,0x9F,0xA0,0xA0,0x9D,0x9D,
-		0x9D,0xC6,0x7A,0x8B,0xBC,0x5F,0x5B,0x48,0x4F,0x54,
-		0x60,0x6B,0x74,0x7E,0x84,0x55,0xC0,0xB3,0xC5,0xD2,
-		0xD2,0xD2,0xCA,0xC1,0xB8,0xAE,0xA2,0x99,0x8D,0x80,
-		0x76,0x81,0x67,0x63,0x3B,0x1B,0x1E,0x1E,0x25,0x2A,
-		0x33,0x3A,0x40,0x4E,0x58,0x65,0x71,0x7C,0x88,0x90,
-		0x97,0x9F,0xA3,0xA7,0xA9,0xAB,0xAB,0xAA,0xA8,0xA4,
-		0xA2,0xAC,0xF0,0x49,0xCB,0x7C,0x3A,0x6A,0x3E,0x5D,
-		0x5D,0x68,0x70,0x79,0x82,0x86,0x33,0xA4,0xAE,0xC7,
-		0xCC,0xCC,0xC8,0xBF,0xB8,0xAD,0xA2,0x97,0x8C,0x80,
-		0x74,0x69,0x62,0xB3,0x3F,0x38,0x1E,0x1A,0x1B,0x1E,
-		0x26,0x30,0x38,0x43,0x4F,0x58,0x65,0x71,0x7E,0x88,
-		0x94,0x9C,0xA3,0xA7,0xAD,0xAF,0xAF,0xB0,0xAE,0xAD,
-		0xA8,0xA6,0xA2,0x9E,0xA1,0xF1,0x82,0x8C,0x81,0x57,
-		0x4F,0x4F,0x55,0x5B,0x68,0x6F,0x77,0x80,0x87,0x85,
-		0x53,0xAF,0xC5,0xC2,0xC6,0xC9,0xBF,0xB8,0xAF,0xA4,
-		0x9A,0x8F,0x84,0x76,0x6A,0x5F,0x59,0xA0,0x0C,0x4F,
-		0x07,0x25,0x16,0x23,0x29,0x35,0x3F,0x48,0x55,0x60,
-		0x6D,0x7A,0x86,0x90,0x9A,0xA2,0xA8,0xAC,0xB1,0xB3,
-		0xB1,0xB0,0xAF,0xAB,0xA8,0xA6,0xA0,0x9D,0x9D,0xE1,
-		0x7D,0x86,0xA7,0x3A,0x6C,0x42,0x58,0x59,0x63,0x6D,
-		0x74,0x7B,0x86,0x8E,0x8F,0x3E,0xAB,0xAF,0xC3,0xC7,
-		0xC1,0xBD,0xB3,0xA8,0x9B,0x93,0x89,0x79,0x6E,0x64,
-		0x58,0x4D,0x48,0x43,0x80,0x20,0x2C,0x1E,0x1A,0x25,
-		0x29,0x36,0x44,0x51,0x5B,0x68,0x74,0x80,0x8C,0x97,
-		0x9F,0xA8,0xB1,0xB5,0xB6,0xB9,0xBA,0xB7,0xB5,0xB3,
-		0xAF,0xA9,0xA4,0x9E,0x99,0x95,0x92,0x8C,0x8B,0x8A,
-		0xD3,0x4F,0x94,0x8D,0x5A,0x41,0x56,0x44,0x5B,0x5C,
-		0x68,0x70,0x77,0x80,0x85,0x8C,0x89,0x47,0xD5,0x93,
-		0xCC,0xB6,0xB6,0xB3,0xA2,0x9D,0x8F,0x86,0x7D,0x72,
-		0x67,0x5D,0x56,0x4D,0x46,0x46,0x74,0x50,0x18,0x37,
-		0x23,0x2E,0x38,0x46,0x50,0x5D,0x6A,0x74,0x81,0x8B,
-		0x95,0x9E,0xA6,0xAE,0xB4,0xB7,0xB8,0xB9,0xB7,0xB7,
-		0xB1,0xAE,0xAA,0xA5,0xA1,0x9C,0x98,0x91,0x8F,0x8A,
-		0x85,0x83,0x81,0x7E,0x7E,0x83,0xD5,0x7C,0x71,0x9D,
-		0x39,0x5E,0x4B,0x4D,0x58,0x5F,0x69,0x70,0x78,0x80,
-		0x84,0x8D,0x91,0x94,0x82,0x89,0x8F,0xB7,0xB9,0xAA,
-		0xA9,0x9E,0x95,0x8B,0x80,0x77,0x6D,0x63,0x5C,0x54,
-		0x4D,0x49,0x44,0x42,0x42,0x47,0x88,0x3F,0x3E,0x44,
-		0x36,0x54,0x4E,0x67,0x6B,0x7E,0x85,0x90,0x9A,0xA1,
-		0xA8,0xAD,0xB3,0xB9,0xBC,0xBD,0xBD,0xBC,0xB9,0xB5,
-		0xB2,0xAD,0xAB,0xA4,0x9E,0x99,0x93,0x8F,0x89,0x85,
-		0x81,0x7C,0x7A,0x77,0x76,0x74,0x72,0x73,0xA5,0x52,
-		0x62,0x69,0x67,0x54,0x45,0x43,0x4D,0x54,0x5D,0x65,
-		0x6D,0x75,0x7C,0x81,0x87,0x8C,0x8B,0x39,0xAF,0xAB,
-		0xB2,0xAA,0xA8,0xA2,0x9A,0x90,0x87,0x81,0x79,0x71,
-		0x68,0x61,0x5B,0x56,0x53,0x52,0x51,0x52,0x58,0xAF,
-		0x35,0x47,0x46,0x4F,0x58,0x63,0x6E,0x79,0x85,0x8D,
-		0x96,0x9F,0xA4,0xAB,0xB3,0xB6,0xB9,0xBB,0xBC,0xB8,
-		0xB5,0xB5,0xAF,0xAB,0xA8,0xA2,0x9D,0x97,0x92,0x8A,
-		0x85,0x80,0x80,0x80,0x80,0x80,0x80,0x80,};
-static ymu8	sample09[4231]={
-		0x7E,0x7E,0x7C,0x7E,0x7E,0x80,0x7A,0x7C,0x70,0x70,
-		0x74,0x62,0x6A,0x62,0x74,0x6E,0x72,0x6C,0x6C,0x6C,
-		0x64,0x62,0x5A,0x58,0x52,0x54,0x50,0x4E,0x4E,0x4E,
-		0x4E,0x52,0x52,0x58,0x60,0x6C,0x76,0x86,0x90,0xA6,
-		0xB4,0xBE,0xCE,0xD8,0xE2,0xE8,0xF4,0xEA,0xEE,0xE0,
-		0xDC,0xD8,0xCA,0xC6,0xB0,0xB0,0x94,0x84,0x7A,0x66,
-		0x62,0x4A,0x4C,0x4A,0x42,0x42,0x34,0x2E,0x3A,0x2C,
-		0x38,0x24,0x30,0x2E,0x40,0x46,0x42,0x4A,0x54,0x56,
-		0x6E,0x72,0x70,0x74,0x70,0x7E,0x70,0x7C,0x7E,0x82,
-		0x82,0x92,0xA2,0xC0,0xEA,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFA,0xFF,0xF2,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFC,0xF8,0xEC,0xDE,
-		0xD8,0xDA,0xDA,0xE4,0xD2,0xDC,0xDC,0xC4,0xC8,0xA2,
-		0x96,0x76,0x44,0x32,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x10,0x18,0x22,
-		0x1A,0x22,0x16,0x0C,0x02,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x08,0x0C,0x18,0x2E,0x2A,0x42,0x3A,0x4C,0x4A,
-		0x50,0x54,0x50,0x64,0x58,0x7C,0x74,0x9C,0x9C,0xAA,
-		0xAA,0xAC,0xAE,0xBC,0xCA,0xCA,0xDA,0xD4,0xE6,0xF0,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,
-		0xF4,0xF6,0xEA,0xE0,0xC6,0xB6,0x94,0x84,0x6E,0x5E,
-		0x54,0x44,0x34,0x36,0x34,0x44,0x4A,0x5A,0x5E,0x62,
-		0x68,0x6A,0x7A,0x7C,0x86,0x90,0x9E,0xAA,0xA6,0xB4,
-		0xB0,0xC8,0xC8,0xD8,0xC8,0xD6,0xCC,0xCE,0xB0,0x9C,
-		0x6E,0x60,0x46,0x44,0x36,0x36,0x30,0x3E,0x42,0x54,
-		0x50,0x60,0x56,0x5C,0x4C,0x48,0x46,0x46,0x4A,0x58,
-		0x5E,0x6A,0x70,0x7E,0x88,0x9C,0xA2,0xB8,0xBA,0xCE,
-		0xC0,0xAE,0x86,0x68,0x4E,0x50,0x44,0x50,0x4E,0x5E,
-		0x72,0x82,0x9A,0x98,0xA6,0x98,0x98,0x8C,0x7E,0x78,
-		0x78,0x82,0x8C,0x96,0x9C,0x98,0xAC,0xAA,0xBA,0xB6,
-		0xC4,0xBA,0xBA,0x8C,0x66,0x34,0x18,0x12,0x0E,0x1E,
-		0x26,0x36,0x50,0x62,0x7C,0x80,0x8A,0x84,0x7E,0x78,
-		0x66,0x64,0x6C,0x76,0x92,0x98,0xB4,0xB8,0xC4,0xCE,
-		0xD6,0xE2,0xE0,0xDE,0xBC,0x7E,0x52,0x18,0x18,0x0A,
-		0x12,0x20,0x26,0x4C,0x5C,0x78,0x80,0x7E,0x86,0x76,
-		0x70,0x56,0x4A,0x4C,0x52,0x72,0x7E,0x9E,0xAC,0xC0,
-		0xD0,0xDA,0xEE,0xEA,0xE2,0xA8,0x6A,0x40,0x18,0x1C,
-		0x0C,0x18,0x2A,0x46,0x74,0x86,0x9C,0xA4,0xA6,0xAE,
-		0x98,0x86,0x68,0x5A,0x64,0x68,0x82,0x94,0xB0,0xC8,
-		0xD4,0xF0,0xEA,0xFF,0xF4,0xEA,0xA4,0x6C,0x34,0x1C,
-		0x12,0x06,0x10,0x1A,0x42,0x68,0x7E,0x94,0x90,0x9C,
-		0x96,0x84,0x6E,0x48,0x44,0x44,0x50,0x54,0x7E,0xA2,
-		0xBC,0xCC,0xEA,0xFF,0xFF,0xFC,0xCC,0x6A,0x46,0x18,
-		0x00,0x00,0x00,0x26,0x46,0x74,0x8C,0x96,0xB6,0xA4,
-		0x8C,0x74,0x4C,0x48,0x26,0x2A,0x3A,0x5A,0x8A,0xA0,
-		0xC8,0xE8,0xF6,0xFF,0xFF,0xFF,0xFF,0xBE,0x3C,0x2E,
-		0x00,0x00,0x00,0x00,0x4A,0x72,0xA2,0xB2,0xC0,0xE0,
-		0xA0,0x74,0x50,0x32,0x22,0x00,0x16,0x4C,0x68,0x96,
-		0xAC,0xEA,0xFF,0xFC,0xFF,0xFF,0xFF,0xFF,0xB2,0x36,
-		0x4C,0x00,0x00,0x00,0x00,0x60,0x64,0x8A,0xD0,0xD4,
-		0xD6,0x9E,0x80,0x78,0x32,0x0C,0x0A,0x20,0x44,0x48,
-		0x82,0xBE,0xD4,0xEA,0xFA,0xFF,0xFF,0xFF,0xFF,0xF2,
-		0x52,0x5A,0x1E,0x00,0x00,0x00,0x2E,0x50,0x5A,0xBA,
-		0xD6,0xCC,0xC6,0xA0,0xA0,0x5E,0x24,0x1E,0x18,0x18,
-		0x30,0x54,0x9A,0xAC,0xD4,0xF8,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0x9A,0x62,0x62,0x00,0x00,0x00,0x00,0x1E,0x2C,
-		0x72,0xCE,0xB4,0xC8,0xD6,0xC0,0x9E,0x5E,0x46,0x32,
-		0x02,0x14,0x30,0x5A,0x82,0xA4,0xDA,0xFE,0xFF,0xFF,
-		0xFF,0xFF,0xFE,0x84,0x9C,0x36,0x00,0x00,0x00,0x00,
-		0x06,0x2A,0x78,0x9E,0xA4,0xE0,0xD2,0xC6,0xB2,0x7E,
-		0x5E,0x2C,0x14,0x2A,0x22,0x50,0x7E,0xA6,0xCE,0xF6,
-		0xFF,0xFF,0xFF,0xFF,0xAC,0xCE,0x70,0x00,0x0C,0x00,
-		0x00,0x00,0x00,0x32,0x62,0x7C,0xB4,0xC0,0xD0,0xD2,
-		0xAC,0xA0,0x64,0x4A,0x44,0x2E,0x48,0x6A,0x7C,0xAC,
-		0xD2,0xFF,0xFF,0xFF,0xFF,0xD2,0xE0,0x58,0x46,0x2A,
-		0x00,0x00,0x00,0x00,0x1C,0x3A,0x60,0x86,0x9E,0xC0,
-		0xB6,0xBA,0xAA,0x86,0x80,0x6C,0x5A,0x7C,0x74,0x94,
-		0xBC,0xD6,0xF0,0xFF,0xBA,0xF0,0xBC,0x4E,0x90,0x2E,
-		0x04,0x2C,0x04,0x0C,0x30,0x36,0x4A,0x62,0x90,0x7A,
-		0xA0,0xAC,0x84,0x96,0x94,0x6C,0x88,0x8C,0x8A,0xA2,
-		0xC0,0xD6,0xE2,0xFF,0xAA,0xDC,0xC4,0x3C,0x94,0x32,
-		0x04,0x34,0x14,0x02,0x40,0x34,0x52,0x54,0x9A,0x6E,
-		0x96,0xAA,0x7A,0x8A,0x9C,0x5A,0x90,0x86,0x86,0xA0,
-		0xBE,0xBC,0xE8,0xFA,0xD8,0xB4,0xFF,0x56,0x82,0x74,
-		0x0A,0x28,0x32,0x00,0x2A,0x30,0x36,0x4A,0x7C,0x72,
-		0x88,0xA6,0x8E,0x86,0xAA,0x70,0x84,0x8C,0x84,0x90,
-		0xB4,0xAC,0xD4,0xE6,0xFA,0x98,0xFC,0xAE,0x4C,0xB8,
-		0x2C,0x1E,0x50,0x06,0x10,0x38,0x26,0x32,0x58,0x76,
-		0x50,0xA8,0x8A,0x76,0xB0,0x80,0x7E,0xA2,0x7E,0x98,
-		0xAE,0xB2,0xC4,0xDE,0xFA,0xB4,0xC0,0xF4,0x2E,0xBA,
-		0x5A,0x16,0x54,0x26,0x02,0x3E,0x20,0x32,0x40,0x74,
-		0x4C,0x8A,0x94,0x74,0xA2,0x96,0x72,0xAA,0x80,0x92,
-		0xA0,0xAE,0xB0,0xDA,0xDA,0xF8,0x9C,0xFC,0x94,0x68,
-		0xB8,0x26,0x4A,0x44,0x0E,0x28,0x2C,0x28,0x2E,0x58,
-		0x5A,0x56,0x9E,0x72,0x90,0xA4,0x7A,0x9C,0x92,0x88,
-		0x9C,0xA0,0xAE,0xC4,0xD4,0xF4,0xC2,0xC4,0xF2,0x40,
-		0xCA,0x4E,0x36,0x58,0x22,0x1A,0x34,0x26,0x2E,0x3C,
-		0x68,0x44,0x8A,0x82,0x74,0xA8,0x88,0x86,0xA4,0x80,
-		0x9E,0x96,0xAE,0xAC,0xD4,0xD2,0xF0,0xA0,0xFE,0x92,
-		0x7A,0xB0,0x2A,0x5E,0x3A,0x24,0x24,0x36,0x2A,0x28,
-		0x5E,0x46,0x5C,0x92,0x60,0x98,0x92,0x84,0x9A,0x90,
-		0x90,0x98,0xA4,0xA8,0xBE,0xD2,0xDA,0xDA,0xA8,0xFC,
-		0x5E,0xAC,0x76,0x3A,0x5A,0x30,0x2C,0x2A,0x36,0x2A,
-		0x36,0x60,0x40,0x76,0x7A,0x6E,0x98,0x86,0x8C,0x98,
-		0x8E,0x9A,0x98,0xB0,0xA8,0xCE,0xCE,0xE8,0xBA,0xC8,
-		0xD4,0x5A,0xC0,0x4E,0x52,0x4E,0x32,0x28,0x30,0x3A,
-		0x22,0x48,0x58,0x3C,0x8C,0x64,0x7C,0x94,0x7E,0x90,
-		0x90,0x90,0x96,0x9C,0xAE,0xA2,0xDA,0xBC,0xEE,0xAC,
-		0xD0,0xC2,0x64,0xC0,0x42,0x60,0x50,0x30,0x34,0x34,
-		0x36,0x2A,0x4A,0x52,0x44,0x88,0x62,0x88,0x90,0x86,
-		0x94,0x90,0x92,0x96,0x9A,0xAE,0x9E,0xD0,0xBA,0xDC,
-		0xBE,0xB6,0xD0,0x66,0xB0,0x62,0x4E,0x64,0x2E,0x3E,
-		0x32,0x3A,0x30,0x3E,0x58,0x46,0x72,0x78,0x72,0x98,
-		0x84,0x8A,0x90,0x8E,0x92,0x98,0xA6,0x9C,0xB0,0xC8,
-		0xB0,0xE2,0x96,0xD0,0x9E,0x70,0xAE,0x48,0x68,0x56,
-		0x36,0x4C,0x32,0x46,0x30,0x48,0x5C,0x46,0x86,0x6E,
-		0x7C,0x94,0x78,0x96,0x7E,0x90,0x94,0x8C,0xA6,0x98,
-		0xAE,0xB4,0xB8,0xD0,0xA4,0xB4,0xC0,0x68,0xAA,0x6E,
-		0x58,0x68,0x48,0x46,0x3C,0x46,0x40,0x36,0x6C,0x4C,
-		0x6E,0x86,0x6A,0x8A,0x8C,0x78,0x8C,0x96,0x7E,0x90,
-		0xA8,0x86,0xA4,0xB2,0xA6,0xB4,0xCA,0xAC,0x9C,0xC6,
-		0x82,0x80,0x90,0x5E,0x54,0x58,0x42,0x38,0x40,0x52,
-		0x36,0x5E,0x72,0x56,0x80,0x8C,0x66,0x90,0x90,0x6C,
-		0x94,0x86,0x84,0x92,0x96,0x9A,0x90,0xAE,0xA2,0xA6,
-		0xC4,0xAE,0x9C,0xBC,0x94,0x72,0x90,0x58,0x4E,0x54,
-		0x3E,0x40,0x40,0x58,0x54,0x58,0x7E,0x6C,0x74,0x8E,
-		0x78,0x80,0x88,0x78,0x7E,0x82,0x8A,0x80,0x96,0x96,
-		0x8A,0x9E,0xAA,0x8A,0xC0,0xA4,0xB2,0x9A,0xA4,0x94,
-		0x6A,0x84,0x64,0x42,0x64,0x44,0x4A,0x54,0x5E,0x66,
-		0x5C,0x84,0x7A,0x6A,0x98,0x76,0x7E,0x86,0x7A,0x80,
-		0x80,0x82,0x92,0x7C,0xA0,0x86,0x9C,0x92,0x92,0xA4,
-		0x8C,0xA2,0x9A,0x94,0x8E,0x8C,0x7E,0x72,0x6A,0x6C,
-		0x5C,0x62,0x60,0x66,0x6A,0x6A,0x76,0x78,0x72,0x7A,
-		0x7A,0x7E,0x7E,0x7E,0x82,0x7A,0x84,0x7E,0x84,0x8A,
-		0x86,0x8C,0x88,0x86,0x8A,0x8C,0x86,0x88,0x8A,0x94,
-		0x86,0x90,0x84,0x88,0x84,0x7E,0x7E,0x64,0x68,0x60,
-		0x50,0x64,0x58,0x60,0x6C,0x5C,0x78,0x6C,0x7C,0x7C,
-		0x68,0x80,0x70,0x78,0x74,0x84,0x74,0x7C,0x70,0x88,
-		0x60,0xA4,0x70,0xA4,0x9C,0x8C,0xA0,0x94,0xC0,0x88,
-		0xA4,0x8C,0x7C,0x84,0x7C,0x78,0x6C,0x74,0x6C,0x70,
-		0x6C,0x74,0x70,0x68,0x70,0x64,0x64,0x58,0x70,0x5C,
-		0x60,0x7C,0x68,0x7C,0x74,0x84,0x8C,0x8C,0x90,0xA0,
-		0x88,0x94,0x88,0x94,0x90,0x8C,0x88,0x88,0x8C,0x94,
-		0x88,0x9C,0x88,0x9C,0x80,0x88,0x84,0x74,0x7C,0x6C,
-		0x6C,0x5C,0x60,0x6C,0x60,0x6C,0x78,0x64,0x80,0x6C,
-		0x90,0x68,0x84,0x7C,0x7C,0x84,0x84,0x80,0x80,0x78,
-		0x90,0x7C,0x94,0x84,0x88,0x8C,0x84,0x80,0x94,0x78,
-		0x88,0x68,0x94,0x70,0x80,0x94,0x70,0x88,0x7C,0x74,
-		0x80,0x6C,0x90,0x64,0x7C,0x88,0x6C,0x74,0x60,0x7C,
-		0x78,0x64,0x8C,0x84,0x60,0x98,0x50,0x90,0x60,0x8C,
-		0x74,0x68,0x8C,0x70,0x8C,0x80,0x80,0x88,0x7C,0x90,
-		0x80,0x90,0x88,0x7C,0x7C,0x90,0x70,0x8C,0x78,0x8C,
-		0x78,0x84,0x80,0x70,0x8C,0x6C,0x88,0x78,0x80,0x7C,
-		0x6C,0x70,0x70,0x80,0x68,0x78,0x80,0x78,0x6C,0x90,
-		0x74,0x80,0x74,0x94,0x70,0x80,0x8C,0x8C,0x80,0x78,
-		0x90,0x68,0x80,0x8C,0x90,0x7C,0x80,0x94,0x6C,0x80,
-		0x88,0x74,0x88,0x64,0x88,0x68,0x78,0x78,0x78,0x7C,
-		0x70,0x8C,0x74,0x7C,0x78,0x80,0x78,0x80,0x6C,0x88,
-		0x7C,0x6C,0x8C,0x7C,0x80,0x70,0x88,0x8C,0x80,0x7C,
-		0x84,0x7C,0x7C,0x5C,0x90,0x74,0x7C,0x78,0x6C,0x80,
-		0x70,0x74,0x84,0x80,0x80,0x74,0x80,0x90,0x5C,0x8C,
-		0x74,0x74,0x88,0x68,0x90,0x74,0x70,0x98,0x70,0x90,
-		0x70,0x88,0x84,0x68,0x6C,0x88,0x68,0x80,0x6C,0x84,
-		0x78,0x78,0x70,0x84,0x68,0x74,0x60,0x78,0x70,0x68,
-		0x68,0x88,0x70,0x70,0x78,0x80,0x7C,0x74,0x78,0x80,
-		0x80,0x70,0x84,0x7C,0x84,0x78,0x7C,0x78,0x88,0x84,
-		0x8C,0x90,0x90,0x94,0x98,0x98,0x94,0x94,0x94,0x94,
-		0x9C,0x9C,0x98,0x98,0xA8,0xA0,0xA4,0xA8,0xA8,0xA4,
-		0xA8,0xAC,0xA0,0x9C,0x94,0xAC,0xA0,0x8C,0xA4,0xA8,
-		0xA8,0x98,0x9C,0x98,0x88,0x9C,0x8C,0x8C,0x8C,0x78,
-		0x80,0x74,0x68,0x58,0x58,0x58,0x48,0x4C,0x50,0x48,
-		0x44,0x44,0x58,0x48,0x44,0x4C,0x4C,0x5C,0x54,0x5C,
-		0x60,0x64,0x70,0x70,0x70,0x7C,0x80,0x84,0x90,0x90,
-		0x90,0x8C,0x90,0x84,0x84,0x7C,0x80,0x7E,0x7E,0x7E,
-		0x7A,0x7E,0x7A,0x7C,0x7C,0x74,0x74,0x74,0x74,0x74,
-		0x76,0x74,0x74,0x7A,0x7A,0x7A,0x80,0x7C,0x80,0x82,
-		0x82,0x82,0x82,0x84,0x80,0x80,0x7E,0x7E,0x7A,0x7E,
-		0x7E,0x7E,0x7E,0x80,0x80,0x7E,0x80,0x80,0x80,0x80,
-		0x82,0x82,0x84,0x86,0x88,0x88,0x8A,0x8E,0x8C,0x8A,
-		0x8E,0x8E,0x8A,0x8A,0x8A,0x88,0x88,0x84,0x84,0x82,
-		0x80,0x7E,0x7E,0x7C,0x7C,0x7C,0x78,0x78,0x76,0x76,
-		0x70,0x70,0x70,0x6E,0x6C,0x6E,0x70,0x6E,0x6C,0x6E,
-		0x6E,0x74,0x72,0x74,0x76,0x76,0x7A,0x7C,0x7C,0x80,
-		0x80,0x82,0x84,0x84,0x86,0x84,0x84,0x8A,0x8A,0x88,
-		0x86,0x84,0x80,0x7A,0x7A,0x7A,0x7A,0x7A,0x78,0x74,
-		0x72,0x72,0x72,0x74,0x76,0x7A,0x7A,0x7A,0x7C,0x7C,
-		0x80,0x80,0x84,0x86,0x84,0x86,0x86,0x88,0x88,0x8A,
-		0x8A,0x8C,0x8E,0x90,0x8E,0x8A,0x86,0x7E,0x78,0x74,
-		0x74,0x72,0x72,0x70,0x72,0x6E,0x6E,0x70,0x72,0x72,
-		0x72,0x72,0x74,0x76,0x76,0x7A,0x7A,0x7A,0x7C,0x80,
-		0x82,0x84,0x86,0x8A,0x8A,0x8C,0x8C,0x90,0x92,0x96,
-		0x96,0x94,0x8E,0x86,0x7E,0x76,0x76,0x76,0x78,0x78,
-		0x78,0x76,0x76,0x76,0x76,0x78,0x7A,0x78,0x78,0x78,
-		0x78,0x7A,0x7A,0x7A,0x7C,0x7C,0x7E,0x80,0x82,0x84,
-		0x86,0x88,0x8A,0x8C,0x92,0x94,0x94,0x92,0x88,0x7E,
-		0x72,0x6A,0x6C,0x72,0x7A,0x7C,0x7C,0x7C,0x7C,0x7E,
-		0x82,0x82,0x84,0x84,0x82,0x82,0x84,0x86,0x88,0x8A,
-		0x8A,0x8A,0x8A,0x8A,0x8E,0x90,0x92,0x94,0x96,0x9A,
-		0xA0,0xA2,0x9E,0x94,0x84,0x74,0x64,0x5E,0x5C,0x62,
-		0x70,0x76,0x78,0x76,0x74,0x76,0x78,0x7C,0x7A,0x78,
-		0x76,0x70,0x72,0x74,0x7A,0x7C,0x7E,0x82,0x84,0x8A,
-		0x90,0x94,0x9C,0x9E,0xA6,0xAC,0xAE,0xAC,0xA4,0x92,
-		0x80,0x6E,0x62,0x5E,0x62,0x6A,0x76,0x80,0x84,0x86,
-		0x88,0x8A,0x90,0x90,0x8C,0x84,0x7A,0x74,0x72,0x7A,
-		0x80,0x88,0x8E,0x8E,0x90,0x90,0x92,0x94,0x96,0x9A,
-		0xA0,0xA8,0xA4,0x9A,0x82,0x66,0x4C,0x3C,0x38,0x3C,
-		0x4C,0x5A,0x66,0x6E,0x72,0x76,0x7A,0x80,0x82,0x82,
-		0x76,0x68,0x54,0x4A,0x48,0x5A,0x72,0x80,0x86,0x86,
-		0x88,0x88,0x90,0x96,0xA2,0xB0,0xBA,0xBC,0xB2,0x98,
-		0x74,0x50,0x38,0x30,0x3A,0x4E,0x62,0x76,0x80,0x84,
-		0x88,0x8A,0x8E,0x90,0x90,0x82,0x6C,0x4E,0x34,0x26,
-		0x2A,0x48,0x74,0x98,0xA8,0xA2,0x9A,0x92,0x94,0x9E,
-		0xB4,0xC4,0xCE,0xBC,0x9E,0x6C,0x3A,0x1C,0x14,0x2A,
-		0x4A,0x70,0x8C,0x98,0x9C,0x9A,0x98,0x9A,0x9C,0x9A,
-		0x8A,0x6E,0x48,0x2A,0x1A,0x22,0x42,0x70,0x9E,0xBE,
-		0xCA,0xC4,0xB0,0xA4,0x9C,0xA8,0xC0,0xD6,0xDA,0xBA,
-		0x86,0x40,0x16,0x08,0x26,0x5A,0x90,0xB6,0xBE,0xB4,
-		0xA2,0x90,0x90,0x92,0x94,0x84,0x66,0x3C,0x1C,0x14,
-		0x28,0x5A,0x8C,0xB2,0xBE,0xBA,0xAC,0x9E,0x98,0xA0,
-		0xB0,0xCC,0xDE,0xDE,0xAC,0x6C,0x18,0x00,0x00,0x14,
-		0x60,0x9E,0xC8,0xC6,0xB4,0x9A,0x86,0x86,0x7E,0x74,
-		0x58,0x36,0x22,0x1C,0x40,0x64,0x96,0xAC,0xAC,0xA0,
-		0x88,0x82,0x84,0x9A,0xB2,0xC8,0xE4,0xF2,0xEE,0xBA,
-		0x6C,0x0C,0x00,0x00,0x04,0x64,0xB0,0xE2,0xE4,0xC8,
-		0xA6,0x86,0x74,0x5C,0x44,0x28,0x14,0x24,0x4A,0x86,
-		0xB0,0xBE,0xA6,0x7E,0x66,0x5C,0x76,0x98,0xB6,0xCC,
-		0xD4,0xE4,0xFC,0xFF,0xC8,0x62,0x00,0x00,0x00,0x0A,
-		0x98,0xFC,0xFF,0xF6,0xB6,0x82,0x66,0x60,0x44,0x24,
-		0x00,0x0E,0x4A,0x9A,0xDC,0xD8,0xA4,0x5C,0x30,0x40,
-		0x68,0xA0,0xBA,0xC2,0xC2,0xC8,0xEE,0xFF,0xFF,0xC4,
-		0x2C,0x00,0x00,0x00,0x58,0xF8,0xFF,0xFF,0xC6,0x88,
-		0x86,0x72,0x52,0x02,0x00,0x00,0x54,0xD8,0xFF,0xEE,
-		0x88,0x28,0x16,0x34,0x72,0x90,0x98,0xA0,0xAC,0xD0,
-		0xE2,0xF0,0xFA,0xF8,0xD4,0x54,0x00,0x00,0x00,0x2A,
-		0xBC,0xFF,0xFF,0xDE,0xA2,0x74,0x60,0x24,0x00,0x00,
-		0x1A,0x94,0xEA,0xFF,0xB8,0x5A,0x22,0x1C,0x48,0x60,
-		0x7C,0x92,0xAA,0xCC,0xCA,0xC6,0xB8,0xC6,0xF0,0xFF,
-		0xDE,0x3C,0x00,0x00,0x00,0x86,0xF2,0xFF,0xCA,0xA8,
-		0x9C,0x88,0x58,0x00,0x00,0x06,0x92,0xFF,0xFF,0xAE,
-		0x46,0x26,0x36,0x4C,0x56,0x54,0x80,0xB0,0xCC,0xB8,
-		0x8E,0x8C,0xAC,0xE4,0xFF,0xFF,0xE4,0x5C,0x00,0x00,
-		0x00,0x50,0xA6,0xF2,0xEE,0xD4,0xBC,0x78,0x3A,0x00,
-		0x00,0x2A,0x88,0xEC,0xEA,0xBE,0x62,0x30,0x28,0x20,
-		0x40,0x60,0x9C,0xC2,0xAE,0x8E,0x6A,0x90,0xBE,0xDA,
-		0xE0,0xD6,0xFA,0xF6,0x64,0x00,0x00,0x00,0x88,0xE6,
-		0xFF,0xD0,0xC6,0xC2,0x78,0x0E,0x00,0x00,0x68,0xDE,
-		0xFF,0xCE,0x96,0x5C,0x2E,0x22,0x00,0x34,0x88,0xC2,
-		0xD2,0x80,0x66,0x70,0xA6,0xD0,0xBE,0xBC,0xD0,0xFF,
-		0xFF,0x98,0x00,0x00,0x00,0x8C,0xCC,0xD6,0xE2,0xE6,
-		0xF4,0x72,0x00,0x00,0x00,0x8A,0xCA,0xD4,0xDC,0xD4,
-		0xCC,0x28,0x00,0x00,0x30,0xC0,0xAC,0x9C,0x9C,0x86,
-		0x90,0x60,0x7A,0xBA,0xCA,0xE0,0xC2,0xF0,0xFF,0xD2,
-		0x00,0x00,0x00,0x72,0xC8,0xB6,0xC6,0xF2,0xEE,0x74,
-		0x00,0x00,0x14,0x8A,0xAE,0xB8,0xEA,0xFF,0xBA,0x2E,
-		0x00,0x00,0x4C,0x82,0xA6,0xA8,0xC8,0xA2,0x42,0x36,
-		0x68,0xC4,0xD4,0xAE,0xC8,0xE6,0xFF,0xFF,0x98,0x00,
-		0x00,0x00,0x3C,0x7A,0xB4,0xFF,0xFF,0xB6,0x3A,0x00,
-		0x0E,0x20,0x32,0x7C,0xE0,0xFF,0xE0,0x80,0x50,0x26,
-		0x00,0x06,0x48,0x9E,0xC8,0x9E,0x98,0x6A,0x58,0x66,
-		0x82,0xC4,0xCA,0xB8,0xC8,0xD0,0xFA,0xFC,0xB0,0x08,
-		0x00,0x0C,0x28,0x62,0x9E,0xFF,0xFF,0xB4,0x58,0x2C,
-		0x18,0x0E,0x0C,0x74,0xD8,0xEE,0xD6,0xAA,0x82,0x40,
-		0x00,0x00,0x4A,0x78,0xA0,0xB0,0xC2,0xA4,0x48,0x50,
-		0x76,0x92,0xA4,0xB0,0xE0,0xEE,0xD6,0xF8,0xFC,0x9E,
-		0x00,0x00,0x18,0x1C,0x50,0xA6,0xFF,0xFF,0xAC,0x7C,
-		0x4E,0x00,0x00,0x0C,0x80,0xB2,0xB6,0xE6,0xE8,0xA4,
-		0x44,0x04,0x0A,0x24,0x1E,0x66,0xC2,0xC2,0xA4,0x84,
-		0x84,0x7A,0x6A,0x98,0xB6,0xB0,0xC0,0xDA,0xF6,0xFC,
-		0xD6,0x6A,0x00,0x10,0x02,0x0E,0x74,0xB6,0xDE,0xCC,
-		0xB6,0xAE,0x54,0x10,0x20,0x2A,0x4C,0x70,0xAA,0xD2,
-		0xBC,0xB2,0xA4,0x48,0x06,0x2A,0x1E,0x36,0x7C,0xAC,
-		0xB8,0x98,0xA2,0xA2,0x6C,0x78,0x9A,0x9C,0xAC,0xC4,
-		0xDA,0xE6,0xFA,0xDA,0x60,0x26,0x30,0x00,0x00,0x5A,
-		0x8E,0xB4,0xCE,0xEC,0xCC,0x72,0x60,0x46,0x0A,0x16,
-		0x46,0x6A,0x8E,0xB6,0xDA,0xC2,0x96,0x72,0x38,0x2E,
-		0x10,0x2C,0x64,0x72,0xA4,0xBA,0xAC,0xAE,0xA0,0xA6,
-		0x9A,0x8A,0xA2,0xA4,0xA8,0xD4,0xE6,0xC4,0x84,0x68,
-		0x62,0x00,0x0C,0x48,0x34,0x62,0xB6,0xBC,0xBC,0xBE,
-		0xA6,0x72,0x4A,0x4A,0x34,0x1E,0x52,0x6E,0x7E,0xAA,
-		0xC4,0xAC,0x92,0x94,0x48,0x24,0x48,0x38,0x4A,0x7C,
-		0x9C,0xAE,0xB8,0xBC,0xB2,0x9C,0xAC,0x9E,0x98,0xB2,
-		0xC0,0xCA,0xBA,0x80,0x64,0x5C,0x14,0x2C,0x42,0x38,
-		0x72,0xA0,0x9A,0xAE,0xB6,0x9A,0x78,0x66,0x5C,0x50,
-		0x58,0x68,0x62,0x76,0x8C,0x84,0x8A,0x80,0x7A,0x84,
-		0x62,0x64,0x64,0x5E,0x70,0x70,0x74,0x8C,0x96,0xA8,
-		0xB4,0xB6,0xBC,0xB4,0xBC,0xBE,0xBC,0xAC,0x98,0x5E,
-		0x6C,0x34,0x1E,0x4C,0x3A,0x50,0x7C,0x7C,0x90,0xA4,
-		0x9A,0x9C,0x9C,0x8A,0x76,0x70,0x68,0x5A,0x5C,0x5E,
-		0x56,0x70,0x7A,0x7A,0x84,0x90,0x7C,0x76,0x80,0x6A,
-		0x72,0x76,0x6A,0x74,0x84,0x8E,0xA6,0xB4,0xB8,0xBA,
-		0xC4,0xC2,0xC2,0xAE,0x9E,0x6E,0x76,0x46,0x30,0x48,
-		0x2A,0x3E,0x5C,0x62,0x78,0x90,0x9A,0xA6,0xB2,0xAA,
-		0x9A,0x9A,0x7C,0x62,0x60,0x4A,0x44,0x56,0x5C,0x6A,
-		0x78,0x80,0x80,0x84,0x82,0x7C,0x7E,0x7E,0x7C,0x90,
-		0x94,0xA4,0xA4,0xB0,0xB0,0xCC,0xD8,0xFF,0xFF,0xFF,
-		0xD4,0x98,0x9C,0x24,0x28,0x00,0x00,0x04,0x14,0x20,
-		0x4C,0x70,0x80,0xA0,0xBC,0xAC,0xC0,0xC0,0xA4,0xA4,
-		0x90,0x70,0x68,0x54,0x34,0x30,0x2C,0x20,0x44,0x48,
-		0x6C,0x88,0x88,0x94,0xA4,0x98,0xA0,0xA8,0x9C,0x9C,
-		0xB8,0xB8,0xD8,0xEC,0xE0,0xD8,0xE0,0x8C,0x98,0x64,
-		0x30,0x4C,0x20,0x20,0x30,0x28,0x1C,0x40,0x4C,0x50,
-		0x8C,0xA4,0xB4,0xD4,0xC0,0xB8,0xB8,0x9C,0x7C,0x7C,
-		0x5C,0x4C,0x48,0x3C,0x34,0x50,0x48,0x4C,0x70,0x64,
-		0x70,0x7C,0x70,0x8C,0x9C,0xB0,0xBC,0xCC,0xC4,0xD8,
-		0xDC,0xD0,0xBC,0xD8,0x9C,0x94,0x9C,0x44,0x6C,0x40,
-		0x1C,0x1C,0x18,0x14,0x34,0x54,0x58,0x8C,0x98,0x94,
-		0xC0,0xB4,0xA4,0xB8,0xA8,0x90,0x94,0x74,0x5C,0x68,
-		0x4C,0x44,0x50,0x48,0x40,0x5C,0x50,0x5C,0x74,0x64,
-		0x7C,0x94,0xA0,0xBC,0xC0,0xB8,0xB8,0xBC,0xAC,0xC8,
-		0xC4,0xD4,0xA8,0xB0,0x8C,0x60,0x70,0x2C,0x2C,0x24,
-		0x2C,0x30,0x4C,0x50,0x5C,0x78,0x74,0x90,0xA4,0xA0,
-		0xB4,0xB4,0xA8,0xA0,0x9C,0x80,0x7C,0x70,0x58,0x5C,
-		0x4C,0x44,0x3C,0x44,0x4C,0x54,0x68,0x6C,0x88,0x94,
-		0xA0,0xAC,0xA8,0xAC,0xB4,0xBC,0xB8,0xCC,0xC4,0xC8,
-		0xA4,0xA0,0x80,0x64,0x6C,0x40,0x40,0x38,0x40,0x38,
-		0x4C,0x48,0x54,0x6C,0x70,0x8C,0x98,0x9C,0xA4,0xA8,
-		0x9C,0x9C,0x9C,0x88,0x88,0x78,0x6C,0x70,0x5C,0x58,
-		0x48,0x48,0x48,0x50,0x60,0x70,0x88,0x8C,0x98,0x9C,
-		0x9C,0x9C,0xA4,0xA8,0xB8,0xC4,0xC4,0xD0,0xB8,0xA4,
-		0x98,0x60,0x60,0x44,0x48,0x44,0x54,0x44,0x54,0x54,
-		0x48,0x60,0x68,0x74,0x84,0x90,0x9C,0xA8,0xAC,0xA0,
-		0xA0,0x8C,0x84,0x80,0x78,0x78,0x7C,0x68,0x68,0x60,
-		0x58,0x5C,0x60,0x60,0x68,0x74,0x78,0x88,0x8C,0x90,
-		0x9C,0x9C,0xA0,0xA8,0xAC,0xB4,0xB4,0xB0,0x9C,0xA4,
-		0x7C,0x74,0x68,0x54,0x54,0x50,0x4C,0x44,0x5C,0x54,
-		0x6C,0x70,0x70,0x7C,0x80,0x84,0x8C,0x9C,0xA0,0xA8,
-		0xA4,0x94,0x94,0x80,0x70,0x6C,0x70,0x6C,0x78,0x78,
-		0x74,0x78,0x70,0x68,0x6C,0x64,0x68,0x6C,0x70,0x78,
-		0x80,0x84,0x8C,0x88,0x88,0x8C,0x8C,0x8C,0x94,0x94,
-		0x94,0x9C,0x9C,0x94,0x98,0x84,0x80,0x74,0x6C,0x64,
-		0x64,0x68,0x6C,0x74,0x70,0x74,0x74,0x6C,0x70,0x68,
-		0x6C,0x78,0x84,0x8C,0x8C,0x90,0x8C,0x84,0x80,0x7C,
-		0x78,0x80,0x80,0x80,0x84,0x80,0x80,0x78,0x68,0x68,
-		0x70,0x70,0x78,0x70,0x70,0x78,0x80,0x80,0x88,0x88,
-		0x88,0x88,0x88,0x80,0x88,0x80,0x78,0x70,0x78,0x78,
-		0x80,0x80,0x80,0x78,0x78,0x68,0x60,0x60,0x68,0x68,
-		0x70,0x78,0x80,0x80,0x80,0x80,0x78,0x70,0x80,0x78,
-		0x80,0x80,0x88,0x88,0x88,0x80,0x80,0x80,0x78,0x80,
-		0x78,0x80,0x80,0x80,0x78,0x68,0x70,0x70,0x70,0x70,
-		0x78,0x78,0x80,0x78,0x78,0x78,0x70,0x68,0x68,0x60,
-		0x70,0x70,0x78,0x70,0x78,0x78,0x78,0x70,0x78,0x78,
-		0x80,0x80,0x80,0x78,0x80,0x88,0x88,0x80,0x80,0x78,
-		0x80,0x80,0x78,0x78,0x80,0x78,0x78,0x78,0x78,0x78,
-		0x78,0x78,0x70,0x78,0x80,0x78,0x70,0x78,0x78,0x70,
-		0x78,0x78,0x78,0x80,0x88,0x80,0x88,0x80,0x80,0x80,
-		0x80,0x80,0x80,0x80,0x78,0x80,0x88,0x80,0x78,0x70,
-		0x68,0x68,0x70,0x78,0x80,0x80,0x88,0x88,0x88,0x88,
-		0x80,0x78,0x78,0x78,0x80,0x78,0x80,0x78,0x80,0x80,
-		0x88,0x80,0x80,0x78,0x80,0x78,0x78,0x80,0x80,0x88,
-		0x88,0x80,0x80,0x78,0x80,0x78,0x78,0x80,0x88,0x88,
-		0x88,0x80,0x80,0x78,0x70,0x68,0x70,0x78,0x80,0x80,
-		0x80,0x80,0x80,0x80,0x80,0x78,0x80,0x78,0x80,0x78,
-		0x80,0x80,0x80,0x80,0x80,0x78,0x78,0x70,0x70,0x78,
-		0x80,0x80,0x80,0x88,0x88,0x80,0x70,0x68,0x68,0x68,
-		0x70,0x78,0x88,0x80,0x88,0x80,0x88,0x80,0x78,0x78,
-		0x78,0x70,0x78,0x78,0x80,0x80,0x80,0x78,0x70,0x70,
-		0x78,0x80,0x78,0x80,0x80,0x80,0x80,0x78,0x70,0x70,
-		0x70,0x78,0x80,0x78,0x80,0x78,0x80,0x78,0x80,0x78,
-		0x80,0x78,0x78,0x78,0x78,0x70,0x78,0x70,0x78,0x70,
-		0x78,0x78,0x80,0x78,0x80,0x78,0x80,0x78,0x80,0x78,
-		0x78,0x70,0x78,0x80,0x80,0x80,0x80,0x78,0x80,0x78,
-		0x78,0x78,0x80,0x78,0x78,0x70,0x78,0x78,0x78,0x70,
-		0x78,0x78,0x78,0x80,0x88,0x80,0x88,0x80,0x80,0x78,
-		0x78,0x80,0x80,0x78,0x80,0x78,0x80,0x78,0x78,0x70,
-		0x78,0x78,0x80,0x80,0x80,0x80,0x80,0x80,0x78,0x70,
-		0x78,0x80,0x78,0x80,0x88,0x80,0x88,0x80,0x78,0x70,
-		0x70,0x70,0x78,0x70,0x78,0x70,0x78,0x78,0x80,0x78,
-		0x80,0x78,0x80,0x80,0x80,0x88,0x80,0x80,0x80,0x78,
-		0x80,0x78,0x80,0x78,0x78,0x70,0x78,0x70,0x78,0x78,
-		0x78,0x78,0x78,0x78,0x78,0x80,0x78,0x70,0x78,0x78,
-		0x80,0x80,0x88,0x80,0x88,0x80,0x80,0x78,0x70,0x68,
-		0x70,0x68,0x70,0x78,0x80,0x78,0x80,0x78,0x80,0x78,
-		0x80,0x78,0x80,0x80,0x80,0x80,0x80,0x78,0x80,0x78,
-		0x78,0x70,0x78,0x78,0x80,0x78,0x80,0x78,0x78,0x70,
-		0x78,0x70,0x78,0x78,0x80,0x78,0x78,0x80,0x88,0x80,
-		0x80,0x80,0x80,0x78,0x80,0x78,0x80,0x78,0x80,0x78,
-		0x78,0x78,0x80,0x78,0x80,0x78,0x80,0x78,0x80,0x80,
-		0x80,0x80,0x80,0x78,0x78,0x78,0x80,0x78,0x80,0x78,
-		0x80,0x78,0x78,0x70,0x70,0x70,0x78,0x80,0x88,0x80,
-		0x88,0x78,0x80,0x78,0x78,0x78,0x80,0x80,0x88,0x80,
-		0x88,0x80,0x80,0x78,0x78,0x70,0x78,0x78,0x80,0x78,
-		0x80,0x78,0x78,0x70,0x78,0x70,0x78,0x70,0x80,0x78,
-		0x80,0x78,0x80,0x78,0x80,0x78,0x80,0x78,0x80,0x78,
-		0x78,0x70,0x78,0x78,0x80,0x78,0x80,0x78,0x80,0x78,
-		0x78,0x70,0x80,0x78,0x88,0x80,0x80,0x78,0x78,0x70,
-		0x78,0x70,0x80,0x78,0x80,0x78,0x80,0x70,0x80,0x60,
-		0x80,0x40,0x78,0x58,0x80,0x80,0x80,0x90,0x78,0x98,
-		0x80,0x98,0x80,0x90,0x78,0x80,0x78,0x78,0x60,0x70,
-		0x78,0x70,0x80,0x70,0x80,0x70,0x78,0x78,0x78,0x70,
-		0x70,0x88,0x88,0x80,0x78,0x70,0x80,0x80,0x90,0x70,
-		0x78,0x70,0x80,0x78,0x78,0x88,0x78,0x70,0x78,0x88,
-		0x80,0x88,0x88,0x80,0x90,0x70,0x88,0x68,0x80,0x78,
-		0x68,0x70,0x88,0x68,0x78,0x98,0x88,0x80,0x90,0x70,
-		0x78,0x88,0x88,0x78,0x88,0x78,0x80,0x80,0x78,0x88,
-		0x50,0x40,0x88,0x68,0xB8,0x78,0xA0,0x50,0xB0,0x70,
-		0xB0,0x38,0x68,0x70,0x70,0x98,0xA8,0x90,0x78,0xA0,
-		0x80,0x88,0x88,0x98,0x88,0x68,0x88,0x80,0x60,0x68,
-		0x80,0x80,0x70,0x80,0x60,0x68,0x80,0x80,0x78,0x80,
-		0x78,0x88,0x80,0x78,0x88,0x88,0x80,0x80,0x78,0x78,
-		0x78,0x80,0x78,0x98,0x70,0x80,0x78,0x68,0x78,0x88,
-		0x78,0x88,0x78,0x80,0x80,0x80,0x88,0x80,0x78,0x70,
-		0x78,0x78,0x80,0x88,0x70,0x88,0x80,0x88,0x78,0x90,
-		0x78,0x78,0x80,0x80,0x78,0x80,0x80,0x88,0x88,0x90,
-		0x80,0x88,0x80,0x78,0x88,0x70,0x78,0x88,0x78,0x80,
-		0x80,0x80,0x78,0x78,0x78,0x68,0x78,0x78,0x90,0x80,
-		0x80,0x88,0x78,0x78,0x88,0x70,0x80,0x80,0x88,0x80,
-		0x80,0x88,0x70,0x80,0x68,0x80,0x80,0x80,0x78,0x80,
-		0x80,0x80,0x78,0x88,0x68,0x78,0x80,0x80,0x78,0x80,
-		0x80,0x78,0x80,0x78,0x78,0x78,0x78,0x88,0x70,0x80,
-		0x78,0x88,0x78,0x70,0x80,0x78,0x80,0x78,0x80,0x80,
-		0x70,0x80,0x80,0x80,0x80,0x80,0x78,0x78,0x70,0x80,
-		0x80,0x88,0x78,0x90,0x80,0x78,0x80,0x78,0x78,0x70,
-		0x70,0x88,0x78,0x80,0x80,0x80,0x80,0x70,0x80,0x78,
-		0x78,0x78,0x84,0x80,0x7C,0x80,0x80,0x7C,0x7C,0x80,
-		0x80,0x80,0x80,0x88,0x80,0x84,0x7C,0x80,0x78,0x7C,
-		0x7C,0x7C,0x80,0x7C,0x80,0x7C,0x80,0x7C,0x80,0x84,
-		0x78,0x84,0x7C,0x80,0x7C,0x7C,0x80,0x7C,0x7C,0x7C,
-		0x7C,0x80,0x7C,0x80,0x80,0x7C,0x80,0x80,0x80,0x7C,
-		0x7C,0x80,0x7C,0x80,0x7C,0x80,0x80,0x80,0x80,0x80,
-		0x84,0x7C,0x7C,0x80,0x7C,0x80,0x80,0x84,0x7C,0x7C,
-		0x80,0x7C,0x80,0x7C,0x80,0x80,0x7C,0x80,0x7C,0x80,
-		0x7C,0x80,0x80,0x7C,0x80,0x80,0x80,0x80,0x80,0x84,
-		0x7C,0x80,0x7C,0x80,0x80,0x7C,0x80,0x7C,0x80,0x80,
-		0x7C,0x80,0x7C,0x80,0x7C,0x80,0x80,0x7C,0x80,0x7C,
-		0x80,0x80,0x7C,0x7C,0x80,0x80,0x7C,0x7C,0x7C,0x7C,
-		0x7C,0x7C,0x80,0x80,0x7C,0x80,0x7C,0x80,0x7C,0x80,
-		0x7C,0x7C,0x7C,0x7C,0x7C,0x80,0x7C,0x7C,0x7C,0x80,
-		0x80,0x80,0x80,0x80,0x7C,0x7C,0x7C,0x7C,0x7C,0x7C,
-		0x7C,0x80,0x7C,0x7C,0x7C,0x7C,0x7C,0x80,0x7C,0x80,
-		0x7C,0x80,0x80,0x80,0x7C,0x80,0x7C,0x7C,0x7C,0x80,
-		0x7C,0x80,0x7E,0x80,0x80,0x80,0x80,0x80,0x80,0x80,
-		0x80,};
-static ymu8	sample10[378]={
-		0x80,0x80,0xCE,0xD4,0xFA,0xFF,0xFF,0xBE,0x9E,0xFF,
-		0xFF,0x00,0xFF,0x5E,0xFF,0xFF,0x18,0xDC,0x00,0x9E,
-		0x00,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x2C,0x1C,0x52,0x66,0xA2,0xCC,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF4,0xFF,
-		0x92,0xA8,0x56,0x1C,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1A,0x36,
-		0x5A,0x7A,0x98,0xA6,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xE6,0xAA,0x86,0x80,0x6C,0x40,0x24,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x08,0x20,0x62,0x76,0x6E,0x8A,0xB4,0xA4,0xCC,0xE2,
-		0xE4,0xF6,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xD6,0xD2,0xD4,0xB2,0xBE,0xB6,0x96,0x92,0x6E,0x70,
-		0x52,0x58,0x58,0x3C,0x26,0x2C,0x0A,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0E,
-		0x00,0x02,0x14,0x06,0x16,0x48,0x18,0x30,0x78,0x64,
-		0x7C,0xBE,0x9A,0xA6,0xA8,0x9E,0x98,0x9C,0x92,0x74,
-		0xA2,0xB6,0xB6,0x9A,0xBE,0xBE,0xA4,0xB0,0x86,0x8C,
-		0xAC,0xB4,0xBA,0xA6,0xD2,0xC0,0xDC,0xD8,0xE8,0xDE,
-		0xC2,0xAC,0x90,0x9C,0x9E,0x84,0x7A,0x7A,0x78,0x84,
-		0x56,0x56,0x2C,0x44,0x4C,0x12,0x22,0x0C,0x30,0x12,
-		0x24,0x00,0x00,0x16,0x00,0x00,0x00,0x00,0x06,0x16,
-		0x14,0x3C,0x22,0x36,0x3A,0x46,0x30,0x58,0x5E,0x54,
-		0x8C,0x84,0x6C,0x8A,0x9A,0x96,0xB0,0xBA,0xBA,0x98,
-		0xAE,0xB2,0x96,0xB6,0xAE,0xB4,0xB8,0xB4,0xAE,0xAE,
-		0xAE,0xB2,0xB4,0xD2,0xC6,0xBE,0xD2,0xC4,0xC4,0xB2,
-		0xAC,0x80,0x80,0x80,0x80,0x80,0x80,0x80,};
-static ymu8	sample11[1527]={
-		0xA0,0x90,0xC4,0xB6,0x92,0xE8,0xFF,0xFF,0x52,0xFE,
-		0x4E,0x86,0xAE,0xEC,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xD6,0xFF,0xFF,0x00,0xBC,0x46,0x00,0x00,0x16,0x00,
-		0x36,0x7E,0xDE,0xFE,0xFF,0xFF,0xFF,0xFF,0xBE,0xFF,
-		0xFF,0xF6,0xFF,0xFF,0x98,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xA4,0x86,0x66,0x00,0x00,0x1C,
-		0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x06,0x46,0x0E,
-		0xAE,0xAE,0x4E,0xFF,0xFF,0xFF,0xCE,0xE8,0xB4,0xA6,
-		0x92,0xBC,0xC6,0xA6,0xBA,0xB6,0x66,0x5A,0x3E,0x0A,
-		0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x86,0x26,0xAE,0x2E,0x94,0x9E,
-		0xEA,0xA0,0x8A,0xA4,0xA0,0x86,0x74,0xF4,0x60,0xB6,
-		0xBE,0x9E,0x8E,0x72,0x86,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x1C,0x1E,0x00,0x0A,0x26,0x46,0x30,
-		0x1C,0x60,0x92,0x26,0xE6,0x9A,0xE6,0xCA,0xFF,0xFF,
-		0xFE,0xFF,0xD6,0xFF,0xFF,0xFF,0xE2,0xFF,0x8A,0x8A,
-		0xA0,0x7C,0x4A,0x4E,0x5E,0x64,0x8E,0x4E,0x5A,0x72,
-		0x6C,0x3A,0x12,0x32,0xCE,0x96,0xB8,0x9E,0xCC,0xD2,
-		0xE6,0xE6,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD6,0x7E,0xCA,
-		0xFE,0xB4,0x6E,0x76,0x4C,0x96,0x60,0x1E,0x56,0x8A,
-		0x62,0xF0,0x8A,0x3E,0xC6,0x56,0xC2,0x74,0x86,0xD2,
-		0xE2,0xFF,0xFF,0xA6,0xFF,0xFF,0xD6,0xDE,0xAA,0xB8,
-		0xFC,0xC0,0x86,0x9A,0x84,0x2C,0x44,0x52,0x48,0x5E,
-		0x02,0x56,0x00,0x48,0x12,0x00,0x1E,0x12,0x00,0x16,
-		0x14,0x00,0x12,0x0E,0x00,0x22,0x08,0x0E,0x0A,0x5E,
-		0x8A,0x4A,0x9E,0x6E,0x86,0x60,0x76,0x5C,0x66,0x36,
-		0x1C,0x4C,0x16,0x72,0x0E,0x00,0x0A,0x1A,0x02,0x00,
-		0x00,0x00,0x00,0x06,0x0A,0x00,0x00,0x12,0x16,0x4E,
-		0x22,0x20,0x72,0x56,0x64,0x4E,0x5E,0x9A,0x94,0x8E,
-		0xA2,0x7A,0x7A,0x9A,0xAC,0xAE,0xA6,0xC2,0xAE,0xA6,
-		0xBA,0x9E,0xDC,0x9E,0xC2,0x8E,0x6E,0x7C,0x80,0x9A,
-		0x76,0x80,0x88,0x82,0xB0,0xD6,0x7E,0x94,0xBC,0xFC,
-		0xD6,0xFF,0xF8,0xFF,0xE6,0xFF,0xB2,0xFC,0xBE,0xF4,
-		0xFA,0xFF,0xFF,0xFF,0xFF,0xFF,0xF2,0xFF,0xD0,0xC8,
-		0xAA,0xFF,0xDA,0xFF,0xC2,0xF0,0xEA,0xB0,0xD0,0xC8,
-		0xEC,0xDE,0xF6,0xCA,0xEE,0xBE,0x8E,0x9E,0xBA,0x5E,
-		0x8A,0xC8,0x9A,0xA8,0xDE,0x8C,0xB2,0x8A,0x96,0x70,
-		0xA8,0x9A,0x92,0xAE,0xE6,0x82,0xA8,0x9E,0x22,0x5C,
-		0x58,0x5E,0x30,0xA4,0x54,0x5E,0x32,0x6A,0x14,0x2C,
-		0x6C,0x2C,0x36,0x00,0x00,0x00,0x00,0x4A,0x00,0x00,
-		0x00,0x06,0x1C,0x00,0x06,0x00,0x14,0x00,0x32,0x20,
-		0x40,0x4C,0x42,0x0A,0x2E,0x1C,0x0E,0x00,0x00,0x00,
-		0x1A,0x00,0x00,0x00,0x00,0x00,0x1E,0x36,0x54,0x16,
-		0x2A,0x12,0x2A,0x38,0x46,0x00,0x0C,0x24,0x1E,0x14,
-		0x14,0x3C,0x18,0x3C,0x60,0x88,0x86,0x88,0x96,0xA6,
-		0xBA,0x7C,0xBA,0x82,0xAC,0x82,0x84,0x80,0xA4,0x22,
-		0xA4,0x8A,0xA2,0xC8,0xD6,0xBE,0xD6,0xB4,0xD4,0x9A,
-		0xB6,0x98,0xA0,0xA6,0xB6,0xD0,0xAA,0xCC,0xC6,0xF6,
-		0xE8,0xDC,0xDA,0xE6,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-		0xEA,0xFF,0xF6,0xFF,0xEA,0xE4,0xF6,0xF8,0xD4,0xD2,
-		0xDA,0xDA,0xFE,0xF4,0xD8,0xD0,0xDA,0xBE,0xF2,0xE0,
-		0xDA,0xBA,0xDE,0xD6,0xC6,0xFF,0xC6,0xE2,0xB6,0xB6,
-		0x9E,0xB8,0xA8,0xB8,0x70,0xBA,0x96,0xDE,0xB6,0xA6,
-		0x8E,0x9A,0x82,0x5E,0x42,0x74,0x64,0x6C,0xA4,0x68,
-		0x7A,0x74,0x6E,0x56,0x00,0x22,0x50,0x4E,0x3E,0x5C,
-		0x62,0x4C,0x30,0x12,0x00,0x34,0x00,0x00,0x0A,0x0E,
-		0x1C,0x44,0x3C,0x5A,0x2E,0x3E,0x06,0x20,0x00,0x0E,
-		0x12,0x30,0x36,0x00,0x0A,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x2E,0x30,0x5C,0x48,0x20,0x4C,0x28,
-		0x0E,0x46,0x26,0x4C,0x2A,0x2C,0x54,0x40,0x26,0x00,
-		0x34,0x58,0x64,0x40,0x62,0x18,0x46,0x58,0x3A,0x5A,
-		0x2A,0x9A,0x6E,0x74,0xAC,0xBA,0xC8,0x9A,0xA0,0x98,
-		0xB8,0xB4,0xCE,0xB6,0xD2,0x86,0xC0,0xA6,0xB6,0xDA,
-		0xFF,0xFF,0xFF,0xFF,0xFF,0xD0,0xBA,0xAA,0xF4,0xFA,
-		0xDE,0xC4,0xDE,0xCA,0xEA,0xF2,0xFF,0xF6,0xE8,0xFF,
-		0xFF,0xE8,0xE8,0xDC,0xFF,0xFF,0xFF,0xFF,0xFE,0xFF,
-		0xFF,0xFF,0xFF,0xFF,0xFC,0xFF,0xE6,0xFF,0xEA,0xD8,
-		0xCA,0xCA,0xC6,0xC2,0xE6,0xA0,0xC2,0x96,0x7E,0xAE,
-		0x58,0x8A,0x5E,0x6A,0x82,0x84,0x44,0x5C,0x86,0x5C,
-		0x8C,0x9A,0x80,0x86,0x86,0x4C,0x60,0x7E,0x50,0x4C,
-		0x36,0x6E,0x44,0x40,0x1C,0x3A,0x14,0x02,0x20,0x1A,
-		0x3C,0x3A,0x04,0x2C,0x0A,0x1E,0x26,0x00,0x00,0x02,
-		0x00,0x00,0x02,0x00,0x00,0x14,0x0C,0x10,0x00,0x00,
-		0x00,0x16,0x1A,0x24,0x40,0x50,0x6A,0x44,0x2E,0x2C,
-		0x38,0x28,0x38,0x38,0x6E,0x6A,0x5C,0x7E,0x40,0x44,
-		0x34,0x2E,0x28,0x74,0x44,0x2A,0x3A,0x5C,0x66,0x84,
-		0x88,0x74,0x78,0x9E,0x9E,0x9E,0x82,0x9A,0x82,0xA6,
-		0x66,0xB0,0x9A,0xA2,0xA6,0xEE,0xB8,0xD4,0xD6,0x96,
-		0xC6,0xB8,0xB4,0xA8,0xE2,0xB0,0xC8,0xA6,0xD2,0xD2,
-		0xD4,0xDE,0xF6,0xCA,0xD0,0xBA,0xB4,0xC0,0xB6,0xB6,
-		0xC6,0x9C,0xD4,0xDA,0xC0,0xA6,0xC2,0xC0,0xD2,0xA8,
-		0xBC,0xB2,0x98,0xCA,0x80,0xCA,0xB2,0xF6,0xE2,0xC2,
-		0xBC,0xD6,0xAE,0x86,0xB8,0x8E,0xBA,0xB0,0x80,0x92,
-		0x58,0x9C,0x7E,0x82,0x74,0x72,0x82,0x6C,0x8A,0x7C,
-		0x9A,0x7E,0x7A,0x7C,0x92,0x7C,0x78,0x96,0x80,0x7E,
-		0x64,0x54,0x5A,0x4C,0x62,0x64,0x70,0x3E,0x68,0x6E,
-		0x78,0x7A,0x76,0x58,0x4C,0x46,0x40,0x3C,0x2E,0x38,
-		0x34,0x44,0x4C,0x28,0x52,0x50,0x46,0x48,0x64,0x4E,
-		0x4E,0x50,0x62,0x32,0x46,0x66,0x60,0x66,0x80,0x7E,
-		0x60,0x60,0x7E,0x52,0x6A,0x66,0x60,0x48,0x5A,0x50,
-		0x66,0x5C,0x6A,0x4E,0x52,0x48,0x54,0x72,0x60,0x7A,
-		0x72,0x7A,0x76,0x78,0x7C,0x7C,0x64,0x8A,0x6E,0x78,
-		0x84,0x8E,0x98,0xB6,0x98,0xB8,0x92,0xA2,0x8E,0x86,
-		0x72,0x80,0x82,0x88,0x84,0x96,0x78,0x88,0x7E,0x8A,
-		0x8E,0x76,0x9C,0x98,0x98,0x7E,0x90,0x70,0x76,0x8C,
-		0xA2,0xA6,0x8C,0xB2,0xA0,0xAE,0x92,0xA6,0x90,0x88,
-		0x9C,0xAE,0xA8,0xBA,0xBA,0xA4,0xBC,0x9E,0x7E,0x7E,
-		0x7E,0x86,0x96,0x72,0xA0,0x86,0x84,0xB6,0x8E,0x96,
-		0x8E,0x9A,0xA2,0x8A,0x8E,0x80,0x76,0x82,0x8A,0x7A,
-		0x80,0x64,0x80,0x96,0xA2,0x9E,0xAA,0xAC,0xA4,0xA4,
-		0xA2,0x80,0x74,0x74,0x6A,0x78,0x6A,0x74,0x7C,0x7A,
-		0x7E,0x60,0x80,0x72,0x6A,0x76,0x7E,0x80,0x5A,0x78,
-		0x74,0x66,0x72,0x76,0x8A,0x6A,0x66,0x78,0x6C,0x68,
-		0x80,0x86,0x68,0x86,0x92,0x8E,0x88,0x74,0x64,0x38,
-		0x4A,0x4E,0x54,0x6E,0x5E,0x82,0x6E,0x7A,0x6A,0x9C,
-		0x6C,0x80,0x74,0x78,0x90,0x82,0x7A,0x78,0x60,0x5E,
-		0x5E,0x70,0x72,0x62,0x64,0x74,0x68,0x86,0x7A,0x9A,
-		0x78,0x9C,0x80,0x9E,0x7C,0x5A,0x66,0x96,0x7A,0x88,
-		0x88,0x9A,0x70,0x86,0x6C,0x6A,0x7A,0x64,0x8E,0x80,
-		0x84,0x7A,0x84,0x82,0x92,0x9A,0x9E,0x8A,0xA0,0x9E,
-		0x84,0x90,0x98,0x6E,0x7A,0x74,0x82,0x86,0x80,0x8E,
-		0x92,0x84,0x84,0x7A,0x92,0x94,0x94,0xAC,0x8C,0x8E,
-		0x7C,0x8C,0x94,0x80,0x88,0x68,0x7E,0x74,0x8C,0x8E,
-		0x74,0x92,0x92,0x8E,0x94,0x72,0x92,0x8E,0x72,0x88,
-		0x8A,0x84,0x88,0x8A,0x96,0x82,0x8C,0x84,0x84,0x9A,
-		0x70,0x68,0x80,0x7A,0x66,0x82,0x7C,0x78,0x78,0x7C,
-		0x74,0x6E,0x72,0x78,0x7A,0x88,0x7E,0x82,0x84,0x80,
-		0x84,0x7C,0x8A,0x72,0x76,0x80,0x7C,0x80,0x82,0x82,
-		0x80,0x8C,0x8C,0x80,0x84,0x76,0x7E,0x6C,0x7A,0x78,
-		0x7A,0x7E,0x74,0x70,0x68,0x70,0x72,0x74,0x70,0x76,
-		0x74,0x86,0x76,0x98,0x84,0x80,0x7C,0x6E,0x7C,0x82,
-		0x7A,0x8E,0x88,0x8A,0x76,0x84,0x7C,0x8E,0x70,0x8C,
-		0x8C,0x7E,0x8E,0x82,0x7E,0x84,0x68,0x66,0x78,0x80,
-		0x92,0x84,0x82,0x74,0x7E,0x72,0x76,0x6C,0x6A,0x72,
-		0x76,0x86,0x8E,0x8E,0x8A,0x86,0x86,0x70,0x84,0x78,
-		0x92,0x8E,0x8E,0x90,0x8C,0x8E,0x7E,0x82,0x7C,0x82,
-		0x70,0x80,0x74,0x72,0x6C,0x74,0x76,0x70,0x6E,0x7E,
-		0x80,0x78,0x7A,0x88,0x82,0x92,0x82,0x8A,0x80,0x7A,
-		0x88,0x86,0x7E,0x8A,0x86,0x88,0x96,0x8E,0x82,0x8C,
-		0x76,0x8C,0x84,0xA0,0x88,0x86,0x7C,0x8A,0x82,0x7C,
-		0x8C,0x60,0x7C,0x82,0x76,0x86,0x80,0x78,0x76,0x72,
-		0x7E,0x78,0x78,0x7E,0x80,0x6E,0x7E,0x7E,0x8C,0x9E,
-		0x86,0x92,0x8E,0x96,0x7C,0x82,0x78,0x7C,0x8A,0x82,
-		0x86,0x76,0x80,0x76,0x80,0x7E,0x82,0x78,0x7C,0x80,
-		0x7E,0x88,0x80,0x7E,0x70,0x86,0x7A,0x80,0x7C,0x74,
-		0x76,0x7E,0x74,0x6C,0x70,0x7A,0x7A,0x86,0x82,0x86,
-		0x8A,0x8A,0x86,0x88,0x78,0x82,0x78,0x82,0x74,0x7A,
-		0x7C,0x76,0x84,0x7C,0x7A,0x8A,0x7C,0x84,0x7E,0x7E,
-		0x80,0x7E,0x82,0x7A,0x7A,0x7A,0x6E,0x76,0x78,0x6E,
-		0x7A,0x7C,0x86,0x78,0x8A,0x82,0x78,0x8E,0x80,0x8A,
-		0x86,0x8A,0x8C,0x84,0x94,0x88,0x8E,0x84,0x7A,0x78,
-		0x7A,0x84,0x80,0x7E,0x7C,0x86,0x7C,0x86,0x82,0x7C,
-		0x7A,0x7A,0x76,0x76,0x7A,0x7E,0x84,0x84,0x80,0x7A,
-		0x7C,0x7C,0x80,0x84,0x80,0x8C,0x82,0x86,0x82,0x86,
-		0x7E,0x80,0x7C,0x84,0x8A,0x82,0x7E,0x88,0x7C,0x82,
-		0x7A,0x86,0x78,0x7C,0x72,0x84,0x7E,0x7C,0x72,0x80,
-		0x82,0x82,0x84,0x86,0x82,0x82,0x80,0x80,0x78,0x7A,
-		0x7A,0x82,0x7E,0x7A,0x7E,0x72,0x78,0x84,0x82,0x84,
-		0x86,0x8E,0x7E,0x78,0x7E,0x78,0x7A,0x7A,0x84,0x8C,
-		0x8A,0x86,0x86,0x7E,0x7A,0x74,0x80,0x88,0x7E,0x80,
-		0x7E,0x74,0x80,0x80,0x88,0x7A,0x80,0x76,0x7C,0x7E,
-		0x80,0x80,0x80,0x80,0x80,0x80,0x80,};
-static ymu8	sample12[258]={
-		0x6F,0x77,0x80,0x5F,0x41,0x80,0xE0,0xFF,0x3F,0x01,
-		0xC0,0xFF,0x07,0xC0,0xBF,0x00,0xFE,0x07,0xE0,0x3F,
-		0xC0,0x3F,0xC0,0x3F,0xE0,0x07,0xFF,0x00,0xFF,0x40,
-		0x3F,0xFF,0x00,0xBF,0xE0,0x00,0xFF,0xC0,0x00,0xFF,
-		0xF0,0x00,0x80,0xFF,0x20,0x00,0xFF,0xF0,0x00,0x0F,
-		0xFF,0xF0,0x00,0x01,0xDF,0xFF,0x80,0x00,0x3F,0xFF,
-		0xFC,0x50,0x00,0x3F,0xDF,0xFF,0xA0,0x20,0x03,0x5F,
-		0xDF,0xFC,0xB0,0x50,0x2B,0x77,0xC7,0xCC,0x94,0x60,
-		0x30,0x1F,0x5F,0xAF,0xC4,0xB0,0x84,0x60,0x30,0x18,
-		0x37,0x77,0xA7,0xDB,0xD8,0xB4,0x80,0x54,0x35,0x3F,
-		0x5F,0x87,0xAF,0xDB,0xDA,0xC0,0x9A,0x78,0x58,0x42,
-		0x47,0x5F,0x80,0x9B,0xBB,0xD6,0xCA,0xB8,0xA0,0x84,
-		0x68,0x4C,0x45,0x4D,0x5F,0x73,0x87,0x9F,0xAF,0xC7,
-		0xBC,0xA8,0x9C,0x88,0x70,0x58,0x4C,0x4A,0x49,0x53,
-		0x69,0x75,0x85,0x97,0xAD,0xB3,0xB2,0xAA,0xA0,0x90,
-		0x80,0x70,0x5C,0x51,0x48,0x49,0x49,0x4F,0x5E,0x6B,
-		0x7B,0x8D,0x97,0x9F,0xAB,0xB0,0xAE,0xA8,0xA0,0x94,
-		0x8B,0x80,0x70,0x65,0x60,0x58,0x53,0x52,0x52,0x57,
-		0x5F,0x69,0x6D,0x7D,0x83,0x8F,0x97,0x9E,0xA4,0xA6,
-		0xAD,0xA8,0xA5,0xA2,0x9A,0x93,0x8B,0x82,0x79,0x70,
-		0x72,0x65,0x60,0x5B,0x55,0x52,0x4F,0x56,0x53,0x57,
-		0x5B,0x5F,0x65,0x6F,0x71,0x7B,0x83,0x8B,0x92,0x9B,
-		0xA1,0xA7,0xB2,0xB6,0xB5,0xB5,0xB4,0xB0,0xAB,0xA4,
-		0x9C,0x94,0x92,0x82,0x81,0x79,0x71,0x77,0x6D,0x68,
-		0x67,0x61,0x5C,0x5E,0x59,0x5C,0x5C,0x63,0x69,0x6D,
-		0x73,0x80,0x80,0x80,0x80,0x80,0x80,0x80,};
-static ymu8	sample13[258]={
-		0x77,0x7B,0x80,0x6F,0x60,0x80,0xAF,0xBF,0x5F,0x40,
-		0x9F,0xBF,0x43,0x9F,0x9F,0x40,0xBE,0x43,0xAF,0x5F,
-		0x9F,0x5F,0x9F,0x5F,0xAF,0x43,0xBF,0x40,0xBF,0x60,
-		0x5F,0xBF,0x40,0x9F,0xAF,0x40,0xBF,0x9F,0x40,0xBF,
-		0xB7,0x40,0x80,0xBF,0x50,0x40,0xBF,0xB7,0x40,0x47,
-		0xBF,0xB7,0x40,0x40,0xAF,0xBF,0x80,0x40,0x5F,0xBF,
-		0xBD,0x68,0x40,0x5F,0xAF,0xBF,0x90,0x50,0x41,0x6F,
-		0xAF,0xBD,0x97,0x68,0x55,0x7B,0xA3,0xA5,0x8A,0x70,

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14076
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14076&view=rev
Author:   spiff_
Date:     2008-07-14 13:09:19 -0700 (Mon, 14 Jul 2008)

Log Message:
-----------
changed: compile module codec instead of keeping binary in svn (linux x86)

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/vc6/dumb/Makefile

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/

Removed Paths:
-------------
    branches/linuxport/XBMC/system/players/paplayer/dumb-i486-linux.so
    branches/linuxport/sources/paplayer/ModuleCodec/

Modified: branches/linuxport/XBMC/Makefile.in
===================================================================
--- branches/linuxport/XBMC/Makefile.in	2008-07-14 20:01:07 UTC (rev 14075)
+++ branches/linuxport/XBMC/Makefile.in	2008-07-14 20:09:19 UTC (rev 14076)
@@ -1,4 +1,4 @@
-DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec xbmc/cores/paplayer/WavPackCodec xbmc/cores/paplayer/GYMCodec xbmc/cores/paplayer/DCACodec xbmc/cores/paplayer/YMCodec
+DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec xbmc/cores/paplayer/WavPackCodec xbmc/cores/paplayer/GYMCodec xbmc/cores/paplayer/DCACodec xbmc/cores/paplayer/YMCodec xbmc/cores/ModuleCodec
 
 LIBS=@LIBS@
 DEBUG_FLAGS=@DEBUG_FLAGS@
@@ -92,6 +92,7 @@
 	$(MAKE) -C xbmc/cores/paplayer/DCACodec
 	$(MAKE) -C xbmc/cores/paplayer/GYMCodec
 	$(MAKE) -C xbmc/cores/paplayer/MIDCodec
+	$(MAKE) -C xbmc/cores/paplayer/ModuleCodec
 	$(MAKE) -C xbmc/cores/paplayer/NSFCodec
 	$(MAKE) -C xbmc/cores/paplayer/SIDCodec
 	$(MAKE) -C xbmc/cores/paplayer/WavPackCodec

Deleted: branches/linuxport/XBMC/system/players/paplayer/dumb-i486-linux.so
===================================================================
(Binary files differ)

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec (from rev 14067, branches/linuxport/sources/paplayer/ModuleCodec)

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/Makefile
===================================================================
--- branches/linuxport/sources/paplayer/ModuleCodec/Makefile	2008-07-14 12:05:16 UTC (rev 14067)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/Makefile	2008-07-14 20:09:19 UTC (rev 14076)
@@ -89,7 +89,7 @@
 
 all: config-if-necessary make-outdirs
 	@$(MAKE) -f $(MAKEFILE) --no-print-directory $(ALL_TARGETS)
-	$(call ECHO,DUMB has been built. Run $(APOST)make install$(APOST) to install it.)
+	@$(MAKE) -C vc6/dumb
 
 install: config-if-necessary
 	@$(MAKE) -f $(MAKEFILE) --no-print-directory $(ALL_TARGETS:%=install-%)

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/vc6/dumb/Makefile
===================================================================
--- branches/linuxport/sources/paplayer/ModuleCodec/vc6/dumb/Makefile	2008-07-14 12:05:16 UTC (rev 14067)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/vc6/dumb/Makefile	2008-07-14 20:09:19 UTC (rev 14076)
@@ -1,7 +1,7 @@
 CFLAGS=-D_LINUX -fPIC -I../../include
 
 dumb-i486-linux.so: DumbDLL.o
-	g++ -shared -o $@ *.o ../../lib/unix/libdumb.a `cat ../../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.def` ../../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.o
+	g++ -shared -o $@ *.o ../../lib/unix/libdumb.a `cat ../../../../DllLoader/exports/wrapper.def` ../../../../DllLoader/exports/wrapper.o && cp $@ ../../../../../../system/players/paplayer/
 
 clean:
 	$(RM) *.o *.so


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14088
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14088&view=rev
Author:   spiff_
Date:     2008-07-14 13:32:47 -0700 (Mon, 14 Jul 2008)

Log Message:
-----------
changed: compile mpc codec instead of keeping binary in svn (linux x86)

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.in
    branches/linuxport/XBMC/configure
    branches/linuxport/XBMC/configure.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/Makefile.xbmc_linux
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/configure
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/include/config.h.in

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/

Removed Paths:
-------------
    branches/linuxport/XBMC/system/players/paplayer/libmpcdec-i486-linux.so
    branches/linuxport/sources/paplayer/MPCCodec/

Modified: branches/linuxport/XBMC/Makefile.in
===================================================================
--- branches/linuxport/XBMC/Makefile.in	2008-07-14 20:32:33 UTC (rev 14087)
+++ branches/linuxport/XBMC/Makefile.in	2008-07-14 20:32:47 UTC (rev 14088)
@@ -1,4 +1,4 @@
-DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec xbmc/cores/paplayer/WavPackCodec xbmc/cores/paplayer/GYMCodec xbmc/cores/paplayer/DCACodec xbmc/cores/paplayer/YMCodec xbmc/cores/ModuleCodec
+DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec xbmc/cores/paplayer/WavPackCodec xbmc/cores/paplayer/GYMCodec xbmc/cores/paplayer/DCACodec xbmc/cores/paplayer/YMCodec xbmc/cores/ModuleCodec xbmc/cores/MPCCodec
 
 LIBS=@LIBS@
 DEBUG_FLAGS=@DEBUG_FLAGS@
@@ -93,6 +93,7 @@
 	$(MAKE) -C xbmc/cores/paplayer/GYMCodec
 	$(MAKE) -C xbmc/cores/paplayer/MIDCodec
 	$(MAKE) -C xbmc/cores/paplayer/ModuleCodec
+	$(MAKE) -C xbmc/cores/paplayer/MPCCodec
 	$(MAKE) -C xbmc/cores/paplayer/NSFCodec
 	$(MAKE) -C xbmc/cores/paplayer/SIDCodec
 	$(MAKE) -C xbmc/cores/paplayer/WavPackCodec

Modified: branches/linuxport/XBMC/configure
===================================================================
--- branches/linuxport/XBMC/configure	2008-07-14 20:32:33 UTC (rev 14087)
+++ branches/linuxport/XBMC/configure	2008-07-14 20:32:47 UTC (rev 14088)
@@ -9914,11 +9914,13 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
 int
 main ()
 {
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
   ;
   return 0;
 }
@@ -9958,11 +9960,13 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE 1
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
 int
 main ()
 {
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
   ;
   return 0;
 }
@@ -13157,6 +13161,7 @@
 ac_config_files="$ac_config_files Makefile Makefile.include xbmc/lib/libPython/linux/Makefile xbmc/lib/libUPnP/Makefile tools/Linux/xbmc.sh tools/XBMCTex/Makefile"
 
 
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -14254,6 +14259,7 @@
 ac_clean_files=$ac_clean_files_save
 
 pushd xbmc/lib/libPython/Python; ./configure --enable-ipv6 --enable-unicode=ucs4 --without-cxx --enable-shared --prefix=`pwd`/../linux/python-lib MACOSX_DEPLOYMENT_TARGET=10.5; sed -i -e "s/define HAVE_GETC_UNLOCKED 1/undef HAVE_GETC_UNLOCKED/" pyconfig.h; cp pyconfig.h Include; popd
+pushd xbmc/cores/paplayer/MPCCodec; ./configure; popd
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.

Modified: branches/linuxport/XBMC/configure.in
===================================================================
--- branches/linuxport/XBMC/configure.in	2008-07-14 20:32:33 UTC (rev 14087)
+++ branches/linuxport/XBMC/configure.in	2008-07-14 20:32:47 UTC (rev 14088)
@@ -332,6 +332,7 @@
 AC_SUBST(LZO_INCLUDES)
 AC_CONFIG_FILES([Makefile Makefile.include xbmc/lib/libPython/linux/Makefile xbmc/lib/libUPnP/Makefile tools/Linux/xbmc.sh tools/XBMCTex/Makefile])
 AC_CONFIG_COMMANDS_POST([pushd xbmc/lib/libPython/Python; ./configure --enable-ipv6 --enable-unicode=ucs4 --without-cxx --enable-shared --prefix=`pwd`/../linux/python-lib MACOSX_DEPLOYMENT_TARGET=10.5; sed -i -e "s/define HAVE_GETC_UNLOCKED 1/undef HAVE_GETC_UNLOCKED/" pyconfig.h; cp pyconfig.h Include; popd])
+AC_CONFIG_COMMANDS_POST([pushd xbmc/cores/paplayer/MPCCodec; ./configure; popd])
 AC_OUTPUT
 
 final_message="$final_message\n  prefix:\t$prefix\n$dashes"

Deleted: branches/linuxport/XBMC/system/players/paplayer/libmpcdec-i486-linux.so
===================================================================
(Binary files differ)

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec (from rev 14067, branches/linuxport/sources/paplayer/MPCCodec)

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/Makefile.in
===================================================================
--- branches/linuxport/sources/paplayer/MPCCodec/Makefile.in	2008-07-14 12:05:16 UTC (rev 14067)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/Makefile.in	2008-07-14 20:32:47 UTC (rev 14088)
@@ -179,6 +179,7 @@
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = src include
 all: all-recursive
+	make -f Makefile.xbmc_linux
 
 .SUFFIXES:
 am--refresh:
@@ -531,6 +532,7 @@
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
+	make -f Makefile.xbmc_linux clean
 
 clean-am: clean-generic clean-libtool mostlyclean-am
 

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/Makefile.xbmc_linux
===================================================================
--- branches/linuxport/sources/paplayer/MPCCodec/Makefile.xbmc_linux	2008-07-14 12:05:16 UTC (rev 14067)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/Makefile.xbmc_linux	2008-07-14 20:32:47 UTC (rev 14088)
@@ -2,7 +2,7 @@
 # To build, first do ./configure and then make. The create the XBMC so by calling this makefile.
 #
 libmpcdec-i486-linux.so:
-	$(CC) -shared -o $@ src/.libs/*.o `cat ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.def` ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.o
+	$(CC) -shared -o $@ src/.libs/*.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o && cp $@ ../../../../system/players/paplayer/
 
 clean:
 	$(RM) *.so

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/configure
===================================================================
--- branches/linuxport/sources/paplayer/MPCCodec/configure	2008-07-14 12:05:16 UTC (rev 14067)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/configure	2008-07-14 20:32:47 UTC (rev 14088)
@@ -1,26 +1,55 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
+# Generated by GNU Autoconf 2.61.
 #
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-DUALCASE=1; export DUALCASE # for MKS sh
 
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   as_unset=unset
@@ -29,8 +58,43 @@
 fi
 
 
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
 # Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
@@ -44,18 +108,19 @@
   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
-    $as_unset $as_var
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
   fi
 done
 
 # Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
@@ -63,157 +128,388 @@
 
 
 # Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# CDPATH.
+$as_unset CDPATH
 
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+if test "x$CONFIG_SHELL" = x; then
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
+else
+  as_have_required=no
 fi
 
+  if test $as_have_required = yes && 	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
 
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
+else
+  as_candidate_shells=
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
+  case $as_dir in
 	 /*)
-	   if ("$as_dir/$as_base" -c '
+	   for as_base in sh bash ksh sh5; do
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	   done;;
+       esac
+done
+IFS=$as_save_IFS
+
+
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+(as_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test $exitcode = 0) || { (exit 1); exit 1; }
+
+(
   as_lineno_1=$LINENO
   as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
   test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
 
+_ASEOF
+}; then
+  break
+fi
+
+fi
+
+      done
+
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+        done
+        export CONFIG_SHELL
+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell autoconf@... about your system,
+  echo including any error possibly output before this
+  echo message
+}
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
   # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
     sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
       N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
       t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
+      s/-\n.*//
     ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
+  chmod +x "$as_me.lineno" ||
     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
   # Exit status is that of the last command.
   exit
 }
 
 
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
 esac
 
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
 rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir
+fi
 echo >conf$$.file
 if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
+  as_ln_s='ln -s'
+  # ... but there are two gotchas:
+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+  # In both cases, we have to default to `cp -p'.
+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
     as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
 elif ln conf$$.file conf$$ 2>/dev/null; then
   as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
@@ -222,7 +518,28 @@
   as_mkdir_p=false
 fi
 
-as_executable_p="test -f"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+        test -d "$1/.";
+      else
+	case $1 in
+        -*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -231,17 +548,8 @@
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
 
-# CDPATH.
-$as_unset CDPATH
 
-
-
 # Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
@@ -395,29 +703,26 @@
 
 tagnames=${tagnames+${tagnames},}F77
 
+exec 7<&0 </dev/null 6>&1
+
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
-exec 6>&1
-
 #
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_files=
 ac_config_libobj_dir=.
+LIBOBJS=
 cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
 # Identity of this package.
 PACKAGE_NAME=
 PACKAGE_TARNAME=
@@ -429,43 +734,166 @@
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
 #endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS LIBTOOL_DEPS SIZE16 USIZE16 SIZE32 USIZE32 SIZE64 OPT LTLIBOBJS'
+ac_subst_vars='SHELL
+PATH_SEPARATOR
+PACKAGE_NAME
+PACKAGE_TARNAME
+PACKAGE_VERSION
+PACKAGE_STRING
+PACKAGE_BUGREPORT
+exec_prefix
+prefix
+program_transform_name
+bindir
+sbindir
+libexecdir
+datarootdir
+datadir
+sysconfdir
+sharedstatedir
+localstatedir
+includedir
+oldincludedir
+docdir
+infodir
+htmldir
+dvidir
+pdfdir
+psdir
+libdir
+localedir
+mandir
+DEFS
+ECHO_C
+ECHO_N
+ECHO_T
+LIBS
+build_alias
+host_alias
+target_alias
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+CYGPATH_W
+PACKAGE
+VERSION
+ACLOCAL
+AUTOCONF
+AUTOMAKE
+AUTOHEADER
+MAKEINFO
+install_sh
+STRIP
+INSTALL_STRIP_PROGRAM
+mkdir_p
+AWK
+SET_MAKE
+am__leading_dot
+AMTAR
+am__tar
+am__untar
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
+CC
+CFLAGS
+LDFLAGS
+CPPFLAGS
+ac_ct_CC
+EXEEXT
+OBJEXT
+DEPDIR
+am__include
+am__quote
+AMDEP_TRUE
+AMDEP_FALSE
+AMDEPBACKSLASH
+CCDEPMODE
+am__fastdepCC_TRUE
+am__fastdepCC_FALSE
+GREP
+EGREP
+LN_S
+ECHO
+AR
+RANLIB
+CPP
+CXX
+CXXFLAGS
+ac_ct_CXX
+CXXDEPMODE
+am__fastdepCXX_TRUE
+am__fastdepCXX_FALSE
+CXXCPP
+F77
+FFLAGS
+ac_ct_F77
+LIBTOOL
+LIBOBJS
+LIBTOOL_DEPS
+SIZE16
+USIZE16
+SIZE32
+USIZE32
+SIZE64
+OPT
+LTLIBOBJS'
 ac_subst_files=''
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP
+CXX
+CXXFLAGS
+CCC
+CXXCPP
+F77
+FFLAGS'
 
+
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
@@ -491,34 +919,48 @@
 # and all the variables that are supposed to be based on exec_prefix
 # by default will actually change.
 # Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
+docdir='${datarootdir}/doc/${PACKAGE}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
 
 ac_prev=
+ac_dashdash=
 for ac_option
 do
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
+    eval $ac_prev=\$ac_option
     ac_prev=
     continue
   fi
 
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+  case $ac_option in
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
+  esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case $ac_option in
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
@@ -540,33 +982,45 @@
   --config-cache | -C)
     cache_file=config.cache ;;
 
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+  -datadir | --datadir | --datadi | --datad)
     ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
     datadir=$ac_optarg ;;
 
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
   -disable-* | --disable-*)
     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+    eval enable_$ac_feature=no ;;
 
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
   -enable-* | --enable-*)
     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_$ac_feature='$ac_optarg'" ;;
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+    eval enable_$ac_feature=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -593,6 +1047,12 @@
   -host=* | --host=* | --hos=* | --ho=*)
     host_alias=$ac_optarg ;;
 
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
@@ -617,13 +1077,16 @@
   | --libexe=* | --libex=* | --libe=*)
     libexecdir=$ac_optarg ;;
 
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
   -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
+  | --localstate | --localstat | --localsta | --localst | --locals)
     ac_prev=localstatedir ;;
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
     localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -688,6 +1151,16 @@
   | --progr-tra=* | --program-tr=* | --program-t=*)
     program_transform_name=$ac_optarg ;;
 
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
@@ -740,24 +1213,20 @@
   -with-* | --with-*)
     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+    eval with_$ac_package=\$ac_optarg ;;
 
   -without-* | --without-*)
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_$ac_package=no" ;;
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+    eval with_$ac_package=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -788,8 +1257,7 @@
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
+    eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
@@ -809,29 +1277,21 @@
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
+# Be sure to have absolute directory names.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
 do
-  eval ac_val=$`echo $ac_var`
+  eval ac_val=\$$ac_var
   case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
+  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; }
 done
 
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
 # There might be people who depend on the old broken behavior: `$host'
 # used to hold the argument of --host etc.
 # FIXME: To remove some day.
@@ -856,94 +1316,76 @@
 test "$silent" = yes && exec 6>/dev/null
 
 
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  { echo "$as_me: error: Working directory cannot be determined" >&2
+   { (exit 1); exit 1; }; }
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  { echo "$as_me: error: pwd does not report name of working directory" >&2
+   { (exit 1); exit 1; }; }
+
+
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_confdir=`(dirname "$0") 2>/dev/null ||
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$0" ||
 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$0" : 'X\(//\)[^/]' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
   srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
+  if test ! -r "$srcdir/$ac_unique_file"; then
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
-  fi
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
 fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
-ac_env_CXX_set=${CXX+set}
-ac_env_CXX_value=$CXX
-ac_cv_env_CXX_set=${CXX+set}
-ac_cv_env_CXX_value=$CXX
-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_env_CXXFLAGS_value=$CXXFLAGS
-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
-ac_env_CXXCPP_set=${CXXCPP+set}
-ac_env_CXXCPP_value=$CXXCPP
-ac_cv_env_CXXCPP_set=${CXXCPP+set}
-ac_cv_env_CXXCPP_value=$CXXCPP
-ac_env_F77_set=${F77+set}
-ac_env_F77_value=$F77
-ac_cv_env_F77_set=${F77+set}
-ac_cv_env_F77_value=$F77
-ac_env_FFLAGS_set=${FFLAGS+set}
-ac_env_FFLAGS_value=$FFLAGS
-ac_cv_env_FFLAGS_set=${FFLAGS+set}
-ac_cv_env_FFLAGS_value=$FFLAGS
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
 
 #
 # Report the --help message.
@@ -972,9 +1414,6 @@
   -n, --no-create         do not create output files
       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
-_ACEOF
-
-  cat <<_ACEOF
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
 			  [$ac_default_prefix]
@@ -992,15 +1431,22 @@
   --bindir=DIR           user executables [EPREFIX/bin]
   --sbindir=DIR          system admin executables [EPREFIX/sbin]
   --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
   --libdir=DIR           object code libraries [EPREFIX/lib]
   --includedir=DIR       C header files [PREFIX/include]
   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
+  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR          info documentation [DATAROOTDIR/info]
+  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR           man documentation [DATAROOTDIR/man]
+  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR          html documentation [DOCDIR]
+  --dvidir=DIR           dvi documentation [DOCDIR]
+  --pdfdir=DIR           pdf documentation [DOCDIR]
+  --psdir=DIR            ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1023,10 +1469,8 @@
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-shared[=PKGS]
-                          build shared libraries [default=yes]
-  --enable-static[=PKGS]
-                          build static libraries [default=yes]
+  --enable-shared[=PKGS]  build shared libraries [default=yes]
+  --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-dependency-tracking  speeds up one-time build
@@ -1039,16 +1483,16 @@
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
-  --with-tags[=TAGS]
-                          include additional configurations [automatic]
+  --with-tags[=TAGS]      include additional configurations [automatic]
 
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
@@ -1060,118 +1504,86 @@
 it to find libraries and programs with nonstandard names/locations.
 
 _ACEOF
+ac_status=$?
 fi
 
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
+    test -d "$ac_dir" || continue
     ac_builddir=.
 
-if test "$ac_dir" != .; then
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
+  .)  # We are building in place.
     ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
     ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
 esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
   done
 fi
 
-test -n "$ac_init_help" && exit 0
+test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
+configure
+generated by GNU Autoconf 2.61
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
-  exit 0
+  exit
 fi
-exec 5>config.log
-cat >&5 <<_ACEOF
+cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
 
 _ACEOF
+exec 5>>config.log
 {
 cat <<_ASUNAME
 ## --------- ##
@@ -1190,7 +1602,7 @@
 /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
 /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
 /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
 /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
@@ -1204,6 +1616,7 @@
   test -z "$as_dir" && as_dir=.
   echo "PATH: $as_dir"
 done
+IFS=$as_save_IFS
 
 } >&5
 
@@ -1225,7 +1638,6 @@
 ac_configure_args=
 ac_configure_args0=
 ac_configure_args1=
-ac_sep=
 ac_must_keep_next=false
 for ac_pass in 1 2
 do
@@ -1236,7 +1648,7 @@
     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+    *\'*)
       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
@@ -1258,9 +1670,7 @@
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
+      ac_configure_args="$ac_configure_args '$ac_arg'"
       ;;
     esac
   done
@@ -1271,8 +1681,8 @@
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
 # would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
   {
@@ -1285,20 +1695,34 @@
 _ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
-{
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
   (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
       sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
     *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
-    esac;
-}
+    esac |
+    sort
+)
     echo
 
     cat <<\_ASBOX
@@ -1309,22 +1733,28 @@
     echo
     for ac_var in $ac_subst_vars
     do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
       cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
 _ASBOX
       echo
       for ac_var in $ac_subst_files
       do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1336,26 +1766,24 @@
 ## ----------- ##
 _ASBOX
       echo
-      sed "/^$/d" confdefs.h | sort
+      cat confdefs.h
       echo
     fi
     test "$ac_signal" != 0 &&
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-     ' 0
+' 0
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
+rm -f -r conftest* confdefs.h
 
 # Predefined preprocessor variables.
 
@@ -1386,14 +1814,17 @@
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
+if test -n "$CONFIG_SITE"; then
+  set x "$CONFIG_SITE"
+elif test "x$prefix" != xNONE; then
+  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+else
+  set x "$ac_default_prefix/share/config.site" \
+	"$ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in $CONFIG_SITE; do
+shift
+for ac_site_file
+do
   if test -r "$ac_site_file"; then
     { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
@@ -1409,8 +1840,8 @@
     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
     esac
   fi
 else
@@ -1422,12 +1853,11 @@
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+for ac_var in $ac_precious_vars; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
   eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
       { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
@@ -1452,8 +1882,7 @@
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1470,11 +1899,6 @@
    { (exit 1); exit 1; }; }
 fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
@@ -1491,34 +1915,44 @@
 
 
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-
 ac_aux_dir=
-for ac_dir in config $srcdir/config; do
-  if test -f $ac_dir/install-sh; then
+for ac_dir in config "$srcdir"/config; do
+  if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
     break
-  elif test -f $ac_dir/install.sh; then
+  elif test -f "$ac_dir/install.sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
-  elif test -f $ac_dir/shtool; then
+  elif test -f "$ac_dir/shtool"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/shtool install -c"
     break
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config $srcdir/config" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in config $srcdir/config" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
    { (exit 1); exit 1; }; }
 fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
 am__api_version="1.9"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -1533,8 +1967,8 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1556,7 +1990,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -1575,21 +2009,22 @@
     ;;
 esac
 done
+IFS=$as_save_IFS
 
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
     INSTALL=$ac_cv_path_install
   else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
+    # removed, or if the value is a relative name.
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -1599,8 +2034,8 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -1642,20 +2077,20 @@
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 test "$program_prefix" != NONE &&
-  program_transform_name="s,^,$program_prefix,;$program_transform_name"
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
-  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
 # Double any \ or $.  echo might interpret backslashes.
 # By default was `s,x,x', remove it if useless.
 cat <<\_ACEOF >conftest.sed
 s/[\\$]/&&/g;s/;s,x,x,$//
 _ACEOF
 program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm conftest.sed
+rm -f conftest.sed
 
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -1707,8 +2142,8 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1721,54 +2156,57 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
+  { echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$AWK" && break
 done
 
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
 all:
-	@echo 'ac_maketemp="$(MAKE)"'
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
 rm -f conftest.make
 fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
   SET_MAKE=
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -1839,8 +2277,8 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1853,32 +2291,34 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
+  { echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1891,27 +2331,41 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  STRIP=$ac_ct_STRIP
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@...." >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
 else
   STRIP="$ac_cv_prog_STRIP"
 fi
@@ -1931,13 +2385,12 @@
 
 
 
-          ac_config_headers="$ac_config_headers include/config.h"
+ac_config_headers="$ac_config_headers include/config.h"
 
 
-# Check whether --enable-shared or --disable-shared was given.
+# Check whether --enable-shared was given.
 if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  p=${PACKAGE-default}
+  enableval=$enable_shared; p=${PACKAGE-default}
     case $enableval in
     yes) enable_shared=yes ;;
     no) enable_shared=no ;;
@@ -1956,12 +2409,12 @@
     esac
 else
   enable_shared=yes
-fi;
+fi
 
-# Check whether --enable-static or --disable-static was given.
+
+# Check whether --enable-static was given.
 if test "${enable_static+set}" = set; then
-  enableval="$enable_static"
-  p=${PACKAGE-default}
+  enableval=$enable_static; p=${PACKAGE-default}
     case $enableval in
     yes) enable_static=yes ;;
     no) enable_static=no ;;
@@ -1980,12 +2433,12 @@
     esac
 else
   enable_static=yes
-fi;
+fi
 
-# Check whether --enable-fast-install or --disable-fast-install was given.
+
+# Check whether --enable-fast-install was given.
 if test "${enable_fast_install+set}" = set; then
-  enableval="$enable_fast_install"
-  p=${PACKAGE-default}
+  enableval=$enable_fast_install; p=${PACKAGE-default}
     case $enableval in
     yes) enable_fast_install=yes ;;
     no) enable_fast_install=no ;;
@@ -2004,65 +2457,95 @@
     esac
 else
   enable_fast_install=yes
-fi;
+fi
 
+
 # Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
   { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+echo "$as_me: error: invalid value of canonical build" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
 build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
+fi
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+echo "$as_me: error: invalid value of canonical host" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
 host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 DEPDIR="${am__leading_dot}deps"
 
-          ac_config_commands="$ac_config_commands depfiles"
+ac_config_commands="$ac_config_commands depfiles"
 
 
 am_make=${MAKE-make}
@@ -2072,8 +2555,8 @@
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
 am__include="#"
 am__quote=
 _am_result=none
@@ -2100,15 +2583,15 @@
 fi
 
 
-echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6
+{ echo "$as_me:$LINENO: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6; }
 rm -f confinc confmf
 
-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
+# Check whether --enable-dependency-tracking was given.
 if test "${enable_dependency_tracking+set}" = set; then
-  enableval="$enable_dependency_tracking"
+  enableval=$enable_dependency_tracking;
+fi
 
-fi;
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
@@ -2133,8 +2616,8 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2147,32 +2630,34 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2185,36 +2670,51 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@...." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 else
   CC="$ac_cv_prog_CC"
 fi
 
 if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2227,74 +2727,34 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
+
   fi
-done
-done
-
 fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2308,7 +2768,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -2319,6 +2779,7 @@
   fi
 done
 done
+IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
@@ -2336,22 +2797,23 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
+  for ac_prog in cl.exe
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2364,36 +2826,38 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
     test -n "$CC" && break
   done
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in cl
+  for ac_prog in cl.exe
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2406,29 +2870,45 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$ac_ct_CC" && break
 done
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@...." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 fi
 
 fi
@@ -2441,21 +2921,35 @@
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
+echo "$as_me:$LINENO: checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
@@ -2480,47 +2974,77 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
+#
+# List of possible output files, starting from the most likely.
+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
+# only as a last resort.  b.out is created by i960 compilers.
+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
+#
+# The IRIX 6 linker writes into existing files which may not be
+# executable, retaining their permissions.  Remove them first so a
+# subsequent execution test works.
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { (ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link_default") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
 	;;
-    conftest.$ac_ext )
-	# This is the source file.
-	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
 	# certainly right.
 	break;;
     *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
+        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
 	break;;
     * )
 	break;;
   esac
 done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
 else
+  ac_file=''
+fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -2532,19 +3056,21 @@
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
 
-# Check the compiler produces executables we can run.  If not, either
+# Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -2563,22 +3089,27 @@
     fi
   fi
 fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 
 rm -f a.out a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
+# Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6; }
 
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -2589,9 +3120,8 @@
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
 	  break;;
     * ) break;;
   esac
@@ -2605,14 +3135,14 @@
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2632,14 +3162,20 @@
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
@@ -2657,12 +3193,12 @@
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2685,50 +3221,49 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_compiler_gnu=no
+	ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2744,38 +3279,118 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14089
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14089&view=rev
Author:   spiff_
Date:     2008-07-14 13:53:15 -0700 (Mon, 14 Jul 2008)

Log Message:
-----------
changed: compile spc codec instead of keeping binary in svn (linux x86)

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.in
    branches/linuxport/XBMC/README.linux
    branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/
    branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/Makefile

Removed Paths:
-------------
    branches/linuxport/XBMC/system/players/paplayer/SNESAPU-i486-linux.so
    branches/linuxport/sources/paplayer/SPCCodec/

Modified: branches/linuxport/XBMC/Makefile.in
===================================================================
--- branches/linuxport/XBMC/Makefile.in	2008-07-14 20:32:47 UTC (rev 14088)
+++ branches/linuxport/XBMC/Makefile.in	2008-07-14 20:53:15 UTC (rev 14089)
@@ -1,4 +1,4 @@
-DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec xbmc/cores/paplayer/WavPackCodec xbmc/cores/paplayer/GYMCodec xbmc/cores/paplayer/DCACodec xbmc/cores/paplayer/YMCodec xbmc/cores/ModuleCodec xbmc/cores/MPCCodec
+DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec xbmc/cores/paplayer/WavPackCodec xbmc/cores/paplayer/GYMCodec xbmc/cores/paplayer/DCACodec xbmc/cores/paplayer/YMCodec xbmc/cores/ModuleCodec xbmc/cores/MPCCodec xbmc/cores/SPCCodec
 
 LIBS=@LIBS@
 DEBUG_FLAGS=@DEBUG_FLAGS@
@@ -96,6 +96,7 @@
 	$(MAKE) -C xbmc/cores/paplayer/MPCCodec
 	$(MAKE) -C xbmc/cores/paplayer/NSFCodec
 	$(MAKE) -C xbmc/cores/paplayer/SIDCodec
+	$(MAKE) -C xbmc/cores/paplayer/SPCCodec
 	$(MAKE) -C xbmc/cores/paplayer/WavPackCodec
 	$(MAKE) -C xbmc/cores/paplayer/YMCodec
 	

Modified: branches/linuxport/XBMC/README.linux
===================================================================
--- branches/linuxport/XBMC/README.linux	2008-07-14 20:32:47 UTC (rev 14088)
+++ branches/linuxport/XBMC/README.linux	2008-07-14 20:53:15 UTC (rev 14089)
@@ -42,15 +42,27 @@
 
 For Ubuntu 7.04 (Feisty Fawn):
 
+<<<<<<< .mine
+   # sudo apt-get install make g++-4.1 gcc-4.1 libsdl1.2-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libsdl-sound1.2-dev libsdl-stretch-dev libfribidi0 libfribidi-dev liblzo1 liblzo-dev libfreetype6 libfreetype6-dev libsqlite3-0 libsqlite3-dev libogg-dev libasound2-dev python-sqlite libglew1 libglew-dev libcurl3-dev g++ gawk x11proto-xinerama-dev libxinerama-dev libxrandr-dev libxrender-dev libmms-dev pmount libmad0-dev libtre-dev libogg-dev libvorbis-dev libmysqlclient15-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper1 libfontconfig1-dev libbz2-dev libboost-dev libtool nasm
+=======
    # sudo apt-get install make g++-4.1 gcc-4.1 libsdl1.2-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libsdl-sound1.2-dev libsdl-stretch-dev libfribidi0 libfribidi-dev liblzo1 liblzo-dev libfreetype6 libfreetype6-dev libsqlite3-0 libsqlite3-dev libogg-dev libasound2-dev python-sqlite libglew1 libglew-dev libcurl3-dev g++ gawk x11proto-xinerama-dev libxinerama-dev libxrandr-dev libxrender-dev libmms-dev pmount libmad0-dev libtre-dev libogg-dev libvorbis-dev libmysqlclient15-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper1 libfontconfig1-dev libbz2-dev libboost-dev libtool zip unrar
+>>>>>>> .r14067
 
 For Ubuntu 7.10 (Gutsy Gibbon):
 
+<<<<<<< .mine
+   # sudo apt-get install make g++-4.1 gcc-4.1 libsdl1.2-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libsdl-sound1.2-dev libsdl-stretch-dev libfribidi0 libfribidi-dev liblzo1 liblzo-dev libfreetype6 libfreetype6-dev libsqlite3-0 libsqlite3-dev libogg-dev libasound2-dev python-sqlite libglew1.4 libglew1.4-dev libcurl3-dev g++ gawk x11proto-xinerama-dev libxinerama-dev libxrandr-dev libxrender-dev libmms-dev pmount libmad0-dev libtre-dev libogg-dev libvorbis-dev libmysqlclient15-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper1 libfontconfig1-dev libbz2-dev libboost-dev libtool nasm
+=======
    # sudo apt-get install make g++-4.1 gcc-4.1 libsdl1.2-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libsdl-sound1.2-dev libsdl-stretch-dev libfribidi0 libfribidi-dev liblzo1 liblzo-dev libfreetype6 libfreetype6-dev libsqlite3-0 libsqlite3-dev libogg-dev libasound2-dev python-sqlite libglew1.4 libglew1.4-dev libcurl3-dev g++ gawk x11proto-xinerama-dev libxinerama-dev libxrandr-dev libxrender-dev libmms-dev pmount libmad0-dev libtre-dev libogg-dev libvorbis-dev libmysqlclient15-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper1 libfontconfig1-dev libbz2-dev libboost-dev libtool zip unrar
+>>>>>>> .r14067
 
 For Ubuntu 8.04 (Hardy Heron):
 
+<<<<<<< .mine
+   # sudo apt-get install make g++-4.1 gcc-4.1 libsdl1.2-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libsdl-sound1.2-dev libsdl-stretch-dev libfribidi0 libfribidi-dev liblzo1 liblzo-dev libfreetype6 libfreetype6-dev libsqlite3-0 libsqlite3-dev libogg-dev libasound2-dev python-sqlite libglew1.5 libglew1.5-dev libcurl3-dev g++ gawk x11proto-xinerama-dev libxinerama-dev libxrandr-dev libxrender-dev libmms-dev pmount libmad0-dev libtre-dev libogg-dev libvorbis-dev libmysqlclient15-dev libhal1 libhal-dev libhal-storage1 libhal-storage-dev libpcre3-dev subversion libjasper1 libfontconfig-dev libbz2-dev libboost-dev libtool nasm
+=======
    # sudo apt-get install make g++-4.1 gcc-4.1 libsdl1.2-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libsdl-sound1.2-dev libsdl-stretch-dev libfribidi0 libfribidi-dev liblzo1 liblzo-dev libfreetype6 libfreetype6-dev libsqlite3-0 libsqlite3-dev libogg-dev libasound2-dev python-sqlite libglew1.5 libglew1.5-dev libcurl3-dev g++ gawk x11proto-xinerama-dev libxinerama-dev libxrandr-dev libxrender-dev libmms-dev pmount libmad0-dev libtre-dev libogg-dev libvorbis-dev libmysqlclient15-dev libhal1 libhal-dev libhal-storage1 libhal-storage-dev libpcre3-dev subversion libjasper1 libfontconfig-dev libbz2-dev libboost-dev libtool zip unrar
+>>>>>>> .r14067
 
 *** For developers and anyone else who compiles frequently it is recommended to use ccache
 sudo apt-get install ccache

Deleted: branches/linuxport/XBMC/system/players/paplayer/SNESAPU-i486-linux.so
===================================================================
(Binary files differ)

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec (from rev 14088, branches/linuxport/sources/paplayer/SPCCodec)

Added: branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/Makefile	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/Makefile	2008-07-14 20:53:15 UTC (rev 14089)
@@ -0,0 +1,4 @@
+all:
+	make -C SNES/SNESAPU
+clean:
+	make -C SNES/SNESAPU clean

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile
===================================================================
--- branches/linuxport/sources/paplayer/SPCCodec/SNES/SNESAPU/Makefile	2008-07-14 20:32:47 UTC (rev 14088)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile	2008-07-14 20:53:15 UTC (rev 14089)
@@ -7,7 +7,7 @@
 DIRS=alac_decoder libfaad mp4ff
 
 SNESAPU-i486-linux.so: $(OBJS)
-	$(CC) -shared -o $@ $(OBJS) `cat ../../../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.def` ../../../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.o
+	$(CC) -shared -o $@ $(OBJS) `cat ../../../../DllLoader/exports/wrapper.def` ../../../../DllLoader/exports/wrapper.o && cp $@ ../../../../../../system/players/paplayer/
 
 clean:
 	$(RM) $(OBJS) *.so


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14091
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14091&view=rev
Author:   spiff_
Date:     2008-07-14 14:15:54 -0700 (Mon, 14 Jul 2008)

Log Message:
-----------
changed: compile mp3 codec instead of keeping binary in svn (linux x86)

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.in
    branches/linuxport/XBMC/configure
    branches/linuxport/XBMC/configure.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/Makefile

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/

Removed Paths:
-------------
    branches/linuxport/XBMC/system/players/paplayer/MADCodec-i486-linux.so
    branches/linuxport/sources/paplayer/MP3Codec/

Modified: branches/linuxport/XBMC/Makefile.in
===================================================================
--- branches/linuxport/XBMC/Makefile.in	2008-07-14 20:58:59 UTC (rev 14090)
+++ branches/linuxport/XBMC/Makefile.in	2008-07-14 21:15:54 UTC (rev 14091)
@@ -1,4 +1,4 @@
-DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec xbmc/cores/paplayer/WavPackCodec xbmc/cores/paplayer/GYMCodec xbmc/cores/paplayer/DCACodec xbmc/cores/paplayer/YMCodec xbmc/cores/ModuleCodec xbmc/cores/MPCCodec xbmc/cores/SPCCodec
+DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec xbmc/cores/paplayer/WavPackCodec xbmc/cores/paplayer/GYMCodec xbmc/cores/paplayer/DCACodec xbmc/cores/paplayer/YMCodec xbmc/cores/paplayer/ModuleCodec xbmc/cores/paplayer/MPCCodec xbmc/cores/paplayer/SPCCodec xbmc/cores/paplayer/MP3Codec
 
 LIBS=@LIBS@
 DEBUG_FLAGS=@DEBUG_FLAGS@
@@ -94,6 +94,7 @@
 	$(MAKE) -C xbmc/cores/paplayer/MIDCodec
 	$(MAKE) -C xbmc/cores/paplayer/ModuleCodec
 	$(MAKE) -C xbmc/cores/paplayer/MPCCodec
+	$(MAKE) -C xbmc/cores/paplayer/MP3Codec
 	$(MAKE) -C xbmc/cores/paplayer/NSFCodec
 	$(MAKE) -C xbmc/cores/paplayer/SIDCodec
 	$(MAKE) -C xbmc/cores/paplayer/SPCCodec

Modified: branches/linuxport/XBMC/configure
===================================================================
--- branches/linuxport/XBMC/configure	2008-07-14 20:58:59 UTC (rev 14090)
+++ branches/linuxport/XBMC/configure	2008-07-14 21:15:54 UTC (rev 14091)
@@ -13162,6 +13162,7 @@
 
 
 
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -14260,6 +14261,7 @@
 
 pushd xbmc/lib/libPython/Python; ./configure --enable-ipv6 --enable-unicode=ucs4 --without-cxx --enable-shared --prefix=`pwd`/../linux/python-lib MACOSX_DEPLOYMENT_TARGET=10.5; sed -i -e "s/define HAVE_GETC_UNLOCKED 1/undef HAVE_GETC_UNLOCKED/" pyconfig.h; cp pyconfig.h Include; popd
 pushd xbmc/cores/paplayer/MPCCodec; ./configure; popd
+pushd xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b; ./configure; popd
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.

Modified: branches/linuxport/XBMC/configure.in
===================================================================
--- branches/linuxport/XBMC/configure.in	2008-07-14 20:58:59 UTC (rev 14090)
+++ branches/linuxport/XBMC/configure.in	2008-07-14 21:15:54 UTC (rev 14091)
@@ -333,6 +333,7 @@
 AC_CONFIG_FILES([Makefile Makefile.include xbmc/lib/libPython/linux/Makefile xbmc/lib/libUPnP/Makefile tools/Linux/xbmc.sh tools/XBMCTex/Makefile])
 AC_CONFIG_COMMANDS_POST([pushd xbmc/lib/libPython/Python; ./configure --enable-ipv6 --enable-unicode=ucs4 --without-cxx --enable-shared --prefix=`pwd`/../linux/python-lib MACOSX_DEPLOYMENT_TARGET=10.5; sed -i -e "s/define HAVE_GETC_UNLOCKED 1/undef HAVE_GETC_UNLOCKED/" pyconfig.h; cp pyconfig.h Include; popd])
 AC_CONFIG_COMMANDS_POST([pushd xbmc/cores/paplayer/MPCCodec; ./configure; popd])
+AC_CONFIG_COMMANDS_POST([pushd xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b; ./configure; popd])
 AC_OUTPUT
 
 final_message="$final_message\n  prefix:\t$prefix\n$dashes"

Deleted: branches/linuxport/XBMC/system/players/paplayer/MADCodec-i486-linux.so
===================================================================
(Binary files differ)

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec (from rev 14088, branches/linuxport/sources/paplayer/MP3Codec)

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/Makefile
===================================================================
--- branches/linuxport/sources/paplayer/MP3Codec/Makefile	2008-07-14 20:32:47 UTC (rev 14088)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/Makefile	2008-07-14 21:15:54 UTC (rev 14091)
@@ -1,9 +1,8 @@
 
 MADCodec-i486-linux.so: libmad-compile MADCodec/MadMp3Decoder.o
-	gcc -shared -o $@  MADCodec/MadMp3Decoder.o libmad-0.15.1b/.libs/libmad.a `cat ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.def` ../../../XBMC/xbmc/cores/DllLoader/exports/wrapper.o -fPIC -O3
+	gcc -shared -o $@  MADCodec/MadMp3Decoder.o libmad-0.15.1b/.libs/libmad.a `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o -fPIC -O3 && cp $@ ../../../../system/players/paplayer/
 
 libmad-compile:
-	(cd libmad-0.15.1b; ./configure CFLAGS="-O3 -fPIC" CXXFLAGS="-O3 -fPIC")
 	$(MAKE) -C libmad-0.15.1b
 	
 MADCodec/MadMp3Decoder.o: MADCodec/MadMp3Decoder.cpp


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14094
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14094&view=rev
Author:   spiff_
Date:     2008-07-14 15:49:42 -0700 (Mon, 14 Jul 2008)

Log Message:
-----------
changed: compile flac codec instead of keeping binary in svn (linux x86)

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.in
    branches/linuxport/XBMC/configure
    branches/linuxport/XBMC/configure.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/DllLibFlac.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/Makefile.in

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/

Removed Paths:
-------------
    branches/linuxport/XBMC/system/players/paplayer/libFLAC-i486-linux.so
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/autom4te.cache/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/build/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/config.log
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/config.status
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/doc/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/doc/html/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/doc/html/images/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/doc/html/ru/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/c/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/c/decode/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/c/decode/file/.deps/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/c/decode/file/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/c/encode/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/c/encode/file/.deps/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/c/encode/file/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/cpp/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/cpp/decode/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/cpp/decode/file/.deps/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/cpp/decode/file/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/cpp/encode/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/cpp/encode/file/.deps/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/cpp/encode/file/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/FLAC/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/FLAC++/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/share/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/share/grabbag/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/test_libs_common/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/libFLAC-i486-linux.so
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/m4/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/man/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/flac/.deps/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/flac/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/.deps/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/ia32/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/private/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/protected/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/ppc/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/ppc/as/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/ppc/gas/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC++/.deps/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC++/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/metaflac/.deps/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/metaflac/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/monkeys_audio_utilities/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/monkeys_audio_utilities/flac_mac/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/monkeys_audio_utilities/flac_ren/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_common/.deps/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_common/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/include/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/include/winamp2/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_xmms/.deps/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_xmms/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/getopt/.deps/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/getopt/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/grabbag/.deps/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/grabbag/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/replaygain_analysis/.deps/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/replaygain_analysis/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/replaygain_synthesis/.deps/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/replaygain_synthesis/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/replaygain_synthesis/include/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/replaygain_synthesis/include/private/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/utf8/.deps/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/utf8/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_grabbag/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_grabbag/cuesheet/.deps/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_grabbag/cuesheet/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_grabbag/picture/.deps/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_grabbag/picture/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC/.deps/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC++/.deps/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC++/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libs_common/.deps/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libs_common/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_seeking/.deps/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_seeking/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_streams/.deps/
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_streams/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/test/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/test/cuesheets/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/test/flac-to-flac-metadata-test-files/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/test/metaflac-test-files/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/test/pictures/Makefile
    branches/linuxport/sources/paplayer/flac-1.2.1/

Modified: branches/linuxport/XBMC/Makefile.in
===================================================================
--- branches/linuxport/XBMC/Makefile.in	2008-07-14 22:07:13 UTC (rev 14093)
+++ branches/linuxport/XBMC/Makefile.in	2008-07-14 22:49:42 UTC (rev 14094)
@@ -1,4 +1,4 @@
-DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec xbmc/cores/paplayer/WavPackCodec xbmc/cores/paplayer/GYMCodec xbmc/cores/paplayer/DCACodec xbmc/cores/paplayer/YMCodec xbmc/cores/paplayer/ModuleCodec xbmc/cores/paplayer/MPCCodec xbmc/cores/paplayer/SPCCodec xbmc/cores/paplayer/MP3Codec
+DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec xbmc/cores/paplayer/WavPackCodec xbmc/cores/paplayer/GYMCodec xbmc/cores/paplayer/DCACodec xbmc/cores/paplayer/YMCodec xbmc/cores/paplayer/ModuleCodec xbmc/cores/paplayer/MPCCodec xbmc/cores/paplayer/SPCCodec xbmc/cores/paplayer/MP3Codec xbmc/cores/paplayer/flac-1.2.1/
 
 LIBS=@LIBS@
 DEBUG_FLAGS=@DEBUG_FLAGS@
@@ -90,6 +90,7 @@
 	$(MAKE) -C xbmc/cores/paplayer/ADPCMCodec
 	$(MAKE) -C xbmc/cores/paplayer/CubeCodec
 	$(MAKE) -C xbmc/cores/paplayer/DCACodec
+	$(MAKE) -C xbmc/cores/paplayer/flac-1.2.1
 	$(MAKE) -C xbmc/cores/paplayer/GYMCodec
 	$(MAKE) -C xbmc/cores/paplayer/MIDCodec
 	$(MAKE) -C xbmc/cores/paplayer/ModuleCodec

Modified: branches/linuxport/XBMC/configure
===================================================================
--- branches/linuxport/XBMC/configure	2008-07-14 22:07:13 UTC (rev 14093)
+++ branches/linuxport/XBMC/configure	2008-07-14 22:49:42 UTC (rev 14094)
@@ -13163,6 +13163,7 @@
 
 
 
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -14262,6 +14263,7 @@
 pushd xbmc/lib/libPython/Python; ./configure --enable-ipv6 --enable-unicode=ucs4 --without-cxx --enable-shared --prefix=`pwd`/../linux/python-lib MACOSX_DEPLOYMENT_TARGET=10.5; sed -i -e "s/define HAVE_GETC_UNLOCKED 1/undef HAVE_GETC_UNLOCKED/" pyconfig.h; cp pyconfig.h Include; popd
 pushd xbmc/cores/paplayer/MPCCodec; ./configure; popd
 pushd xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b; ./configure CFLAGS="-O3 -fPIC" CXXFLAGS="-O3 -fPIC"; popd
+pushd xbmc/cores/paplayer/flac-1.2.1; ./configure; popd
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.

Modified: branches/linuxport/XBMC/configure.in
===================================================================
--- branches/linuxport/XBMC/configure.in	2008-07-14 22:07:13 UTC (rev 14093)
+++ branches/linuxport/XBMC/configure.in	2008-07-14 22:49:42 UTC (rev 14094)
@@ -334,6 +334,7 @@
 AC_CONFIG_COMMANDS_POST([pushd xbmc/lib/libPython/Python; ./configure --enable-ipv6 --enable-unicode=ucs4 --without-cxx --enable-shared --prefix=`pwd`/../linux/python-lib MACOSX_DEPLOYMENT_TARGET=10.5; sed -i -e "s/define HAVE_GETC_UNLOCKED 1/undef HAVE_GETC_UNLOCKED/" pyconfig.h; cp pyconfig.h Include; popd])
 AC_CONFIG_COMMANDS_POST([pushd xbmc/cores/paplayer/MPCCodec; ./configure; popd])
 AC_CONFIG_COMMANDS_POST([pushd xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b; ./configure CFLAGS="-O3 -fPIC" CXXFLAGS="-O3 -fPIC"; popd])
+AC_CONFIG_COMMANDS_POST([pushd xbmc/cores/paplayer/flac-1.2.1; ./configure; popd])
 AC_OUTPUT
 
 final_message="$final_message\n  prefix:\t$prefix\n$dashes"

Deleted: branches/linuxport/XBMC/system/players/paplayer/libFLAC-i486-linux.so
===================================================================
(Binary files differ)

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/DllLibFlac.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/DllLibFlac.h	2008-07-14 22:07:13 UTC (rev 14093)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/DllLibFlac.h	2008-07-14 22:49:42 UTC (rev 14094)
@@ -22,7 +22,7 @@
  */
 
 #include "DynamicDll.h"
-#include "flac/stream_decoder.h"
+#include "flac-1.2.1/include/FLAC/stream_decoder.h"
 
 class DllLibFlacInterface
 {

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1 (from rev 14088, branches/linuxport/sources/paplayer/flac-1.2.1)

Deleted: branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/Makefile
===================================================================
--- branches/linuxport/sources/paplayer/flac-1.2.1/Makefile	2008-07-14 20:32:47 UTC (rev 14088)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/Makefile	2008-07-14 22:49:42 UTC (rev 14094)
@@ -1,677 +0,0 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-# Makefile.  Generated from Makefile.in by configure.
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-#  FLAC - Free Lossless Audio Codec
-#  Copyright (C) 2001,2002,2003,2004,2005,2006,2007  Josh Coalson
-#
-#  This file is part the FLAC project.  FLAC is comprised of several
-#  components distributed under difference licenses.  The codec libraries
-#  are distributed under Xiph.Org's BSD-like license (see the file
-#  COPYING.Xiph in this distribution).  All other programs, libraries, and
-#  plugins are distributed under the GPL (see COPYING.GPL).  The documentation
-#  is distributed under the Gnu FDL (see COPYING.FDL).  Each file in the
-#  FLAC distribution contains at the top the terms under which it may be
-#  distributed.
-#
-#  Since this particular file is relevant to all components of FLAC,
-#  it may be distributed under the Xiph.Org license, which is the least
-#  restrictive of those mentioned above.  See the file COPYING.Xiph in this
-#  distribution.
-
-#
-# automake provides the following useful targets:
-#
-# all: build all programs and libraries using the current
-# configuration (set by configure)
-#
-# check: build and run all self-tests
-#
-# clean: remove everything except what's required to build everything
-#
-# distclean: remove everything except what goes in the distribution
-#
-
-srcdir = .
-top_srcdir = .
-
-pkgdatadir = $(datadir)/flac
-pkglibdir = $(libdir)/flac
-pkgincludedir = $(includedir)/flac
-top_builddir = .
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_triplet = i686-pc-linux-gnuaout
-ACLOCAL = ${SHELL} /home/vulkan/xbmc/sources/paplayer/flac-1.2.1/missing --run aclocal-1.7
-ACLOCAL_AMFLAGS = -I m4
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/vulkan/xbmc/sources/paplayer/flac-1.2.1/missing --run tar
-AR = ar
-AS = gas
-AUTOCONF = ${SHELL} /home/vulkan/xbmc/sources/paplayer/flac-1.2.1/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/vulkan/xbmc/sources/paplayer/flac-1.2.1/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/vulkan/xbmc/sources/paplayer/flac-1.2.1/missing --run automake-1.7
-AWK = gawk
-CC = gcc
-CCAS = $(CC)
-CCASFLAGS = $(CFLAGS)
-CCDEPMODE = depmode=gcc3
-CFLAGS = -O3 -funroll-loops -finline-functions -Wall -W -Winline -g -O2
-CPP = gcc -E
-CPPFLAGS = -DFLaC__INLINE=__inline__ -DNDEBUG -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEBUG_FALSE = 
-DEBUG_TRUE = #
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DOCBOOK_TO_MAN = 
-DOXYGEN = 
-ECHO = echo
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = /bin/grep -E
-EXEEXT = 
-F77 = 
-FFLAGS = 
-FLAC__TEST_LEVEL = 1
-FLAC__TEST_WITH_VALGRIND = no
-FLaC__CPU_IA32_FALSE = #
-FLaC__CPU_IA32_TRUE = 
-FLaC__CPU_PPC_FALSE = 
-FLaC__CPU_PPC_TRUE = #
-FLaC__CPU_SPARC_FALSE = 
-FLaC__CPU_SPARC_TRUE = #
-FLaC__HAS_AS_FALSE = 
-FLaC__HAS_AS_TRUE = #
-FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = 
-FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = #
-FLaC__HAS_DOCBOOK_TO_MAN_FALSE = 
-FLaC__HAS_DOCBOOK_TO_MAN_TRUE = #
-FLaC__HAS_DOXYGEN_FALSE = 
-FLaC__HAS_DOXYGEN_TRUE = #
-FLaC__HAS_GAS_FALSE = #
-FLaC__HAS_GAS_TRUE = 
-FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = 
-FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = #
-FLaC__HAS_NASM_FALSE = 
-FLaC__HAS_NASM_TRUE = #
-FLaC__HAS_OGG_FALSE = #
-FLaC__HAS_OGG_TRUE = 
-FLaC__HAS_XMMS_FALSE = 
-FLaC__HAS_XMMS_TRUE = #
-FLaC__INSTALL_XMMS_PLUGIN_LOCALLY_FALSE = 
-FLaC__INSTALL_XMMS_PLUGIN_LOCALLY_TRUE = #
-FLaC__NO_ASM_FALSE = 
-FLaC__NO_ASM_TRUE = #
-FLaC__SSE_OS_FALSE = 
-FLaC__SSE_OS_TRUE = #
-FLaC__SYS_DARWIN_FALSE = 
-FLaC__SYS_DARWIN_TRUE = #
-FLaC__SYS_LINUX_FALSE = 
-FLaC__SYS_LINUX_TRUE = #
-FLaC__USE_3DNOW_FALSE = #
-FLaC__USE_3DNOW_TRUE = 
-FLaC__USE_ALTIVEC_FALSE = #
-FLaC__USE_ALTIVEC_TRUE = 
-FLaC__WITH_CPPLIBS_FALSE = #
-FLaC__WITH_CPPLIBS_TRUE = 
-GAS = gas
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
-LIBICONV = 
-LIBOBJS = 
-LIBS = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBICONV = 
-LTLIBOBJS = 
-MAINT = #
-MAINTAINER_MODE_FALSE = 
-MAINTAINER_MODE_TRUE = #
-MAKEINFO = ${SHELL} /home/vulkan/xbmc/sources/paplayer/flac-1.2.1/missing --run makeinfo
-MINGW_WINSOCK_LIBS = 
-NASM = 
-OBJEXT = o
-OBJ_FORMAT = elf
-OGG_CFLAGS = 
-OGG_LIBS =  -logg
-PACKAGE = flac
-PACKAGE_BUGREPORT = 
-PACKAGE_NAME = 
-PACKAGE_STRING = 
-PACKAGE_TARNAME = 
-PACKAGE_VERSION = 
-PATH_SEPARATOR = :
-RANLIB = ranlib
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 1.2.1
-XMMS_CFLAGS = 
-XMMS_CONFIG = no
-XMMS_DATA_DIR = 
-XMMS_EFFECT_PLUGIN_DIR = 
-XMMS_GENERAL_PLUGIN_DIR = 
-XMMS_INPUT_PLUGIN_DIR = 
-XMMS_LIBS = 
-XMMS_OUTPUT_PLUGIN_DIR = 
-XMMS_PLUGIN_DIR = 
-XMMS_VERSION = 
-XMMS_VISUALIZATION_PLUGIN_DIR = 
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = 
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnuaout
-build_alias = 
-build_cpu = i686
-build_os = linux-gnuaout
-build_vendor = pc
-datadir = ${prefix}/share
-exec_prefix = ${prefix}
-host = i686-pc-linux-gnuaout
-host_alias = 
-host_cpu = i686
-host_os = linux-gnuaout
-host_vendor = pc
-includedir = ${prefix}/include
-infodir = ${prefix}/share/info
-install_sh = /home/vulkan/xbmc/sources/paplayer/flac-1.2.1/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localstatedir = ${prefix}/var
-mandir = ${prefix}/share/man
-oldincludedir = /usr/include
-prefix = /usr/local
-program_transform_name = s,x,x,
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target_alias = 
-
-AUTOMAKE_OPTIONS = foreign 1.7
-
-SUBDIRS = doc include m4 man src examples test build obj
-
-DISTCLEANFILES = libtool-disable-static
-
-EXTRA_DIST = \
-	COPYING.FDL \
-	COPYING.GPL \
-	COPYING.LGPL \
-	COPYING.Xiph \
-	FLAC.dsw \
-	FLAC.sln \
-	Makefile.lite \
-	all.dsp \
-	all_dynamic.dsp \
-	all_static.dsp \
-	autogen.sh \
-	config.rpath \
-	depcomp \
-	ltmain.sh \
-	strip_non_asm_libtool_args.sh
-
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
-	Makefile.am aclocal.m4 config.guess config.h.in config.rpath \
-	config.sub configure.in depcomp install-sh ltmain.sh missing \
-	mkinstalldirs
-DIST_SUBDIRS = $(SUBDIRS)
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-	$(MAKE) libFLAC-i486-linux.so
-
-libFLAC-i486-linux.so: 
-	gcc -shared -fpic -o $@ -rdynamic src/libFLAC/*.o `cat $(XBMC_ROOT)/xbmc/cores/DllLoader/exports/wrapper.def` $(XBMC_ROOT)/xbmc/cores/DllLoader/exports/wrapper.o
-
-.SUFFIXES:
-
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno
-$(srcdir)/Makefile.in: # Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
-Makefile: # $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
-
-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: # $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-$(ACLOCAL_M4): # configure.in 
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-
-$(srcdir)/config.h.in: # $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	touch $(srcdir)/config.h.in
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	else \
-	  include_option=--include; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = .
-distdir = $(PACKAGE)-$(VERSION)
-
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkinstalldirs) $(distdir)/src/libFLAC $(distdir)/src/libFLAC++
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	$(am__remove_distdir)
-	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
-	  && rm -f $(distdir).tar.gz \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@echo "$(distdir).tar.gz is ready for distribution" | \
-	  sed 'h;s/./=/g;p;x;p;x'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile config.h
-installdirs: installdirs-recursive
-installdirs-am:
-
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive dist dist-all dist-gzip distcheck distclean \
-	distclean-generic distclean-hdr distclean-libtool \
-	distclean-recursive distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am dvi-recursive info info-am \
-	info-recursive install install-am install-data install-data-am \
-	install-data-recursive install-exec install-exec-am \
-	install-exec-recursive install-info install-info-am \
-	install-info-recursive install-man install-recursive \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am installdirs-recursive maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
-	tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/Makefile.in
===================================================================
--- branches/linuxport/sources/paplayer/flac-1.2.1/Makefile.in	2008-07-14 20:32:47 UTC (rev 14088)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/Makefile.in	2008-07-14 22:49:42 UTC (rev 14094)
@@ -274,7 +274,11 @@
 DIST_SUBDIRS = $(SUBDIRS)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+	$(MAKE) libFLAC-i486-linux.so
 
+libFLAC-i486-linux.so: 
+	gcc -shared -fpic -o $@ -rdynamic src/libFLAC/*.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o && cp $@ ../../../../system/players/paplayer/
+
 .SUFFIXES:
 
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \

Deleted: branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/build/Makefile
===================================================================
--- branches/linuxport/sources/paplayer/flac-1.2.1/build/Makefile	2008-07-14 20:32:47 UTC (rev 14088)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/build/Makefile	2008-07-14 22:49:42 UTC (rev 14094)
@@ -1,375 +0,0 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-# build/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-#  FLAC - Free Lossless Audio Codec
-#  Copyright (C) 2002,2003,2004,2005,2006,2007  Josh Coalson
-#
-#  This file is part the FLAC project.  FLAC is comprised of several
-#  components distributed under difference licenses.  The codec libraries
-#  are distributed under Xiph.Org's BSD-like license (see the file
-#  COPYING.Xiph in this distribution).  All other programs, libraries, and
-#  plugins are distributed under the GPL (see COPYING.GPL).  The documentation
-#  is distributed under the Gnu FDL (see COPYING.FDL).  Each file in the
-#  FLAC distribution contains at the top the terms under which it may be
-#  distributed.
-#
-#  Since this particular file is relevant to all components of FLAC,
-#  it may be distributed under the Xiph.Org license, which is the least
-#  restrictive of those mentioned above.  See the file COPYING.Xiph in this
-#  distribution.
-
-srcdir = .
-top_srcdir = ..
-
-pkgdatadir = $(datadir)/flac
-pkglibdir = $(libdir)/flac
-pkgincludedir = $(includedir)/flac
-top_builddir = ..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_triplet = i686-pc-linux-gnuaout
-ACLOCAL = ${SHELL} /home/vulkan/xbmc/sources/paplayer/flac-1.2.1/missing --run aclocal-1.7
-ACLOCAL_AMFLAGS = -I m4
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/vulkan/xbmc/sources/paplayer/flac-1.2.1/missing --run tar
-AR = ar
-AS = gas
-AUTOCONF = ${SHELL} /home/vulkan/xbmc/sources/paplayer/flac-1.2.1/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/vulkan/xbmc/sources/paplayer/flac-1.2.1/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/vulkan/xbmc/sources/paplayer/flac-1.2.1/missing --run automake-1.7
-AWK = gawk
-CC = gcc
-CCAS = $(CC)
-CCASFLAGS = $(CFLAGS)
-CCDEPMODE = depmode=gcc3
-CFLAGS = -O3 -funroll-loops -finline-functions -Wall -W -Winline -g -O2
-CPP = gcc -E
-CPPFLAGS = -DFLaC__INLINE=__inline__ -DNDEBUG -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEBUG_FALSE = 
-DEBUG_TRUE = #
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DOCBOOK_TO_MAN = 
-DOXYGEN = 
-ECHO = echo
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = /bin/grep -E
-EXEEXT = 
-F77 = 
-FFLAGS = 
-FLAC__TEST_LEVEL = 1
-FLAC__TEST_WITH_VALGRIND = no
-FLaC__CPU_IA32_FALSE = #
-FLaC__CPU_IA32_TRUE = 
-FLaC__CPU_PPC_FALSE = 
-FLaC__CPU_PPC_TRUE = #
-FLaC__CPU_SPARC_FALSE = 
-FLaC__CPU_SPARC_TRUE = #
-FLaC__HAS_AS_FALSE = 
-FLaC__HAS_AS_TRUE = #
-FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = 
-FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = #
-FLaC__HAS_DOCBOOK_TO_MAN_FALSE = 
-FLaC__HAS_DOCBOOK_TO_MAN_TRUE = #
-FLaC__HAS_DOXYGEN_FALSE = 
-FLaC__HAS_DOXYGEN_TRUE = #
-FLaC__HAS_GAS_FALSE = #
-FLaC__HAS_GAS_TRUE = 
-FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = 
-FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = #
-FLaC__HAS_NASM_FALSE = 
-FLaC__HAS_NASM_TRUE = #
-FLaC__HAS_OGG_FALSE = #
-FLaC__HAS_OGG_TRUE = 
-FLaC__HAS_XMMS_FALSE = 
-FLaC__HAS_XMMS_TRUE = #
-FLaC__INSTALL_XMMS_PLUGIN_LOCALLY_FALSE = 
-FLaC__INSTALL_XMMS_PLUGIN_LOCALLY_TRUE = #
-FLaC__NO_ASM_FALSE = 
-FLaC__NO_ASM_TRUE = #
-FLaC__SSE_OS_FALSE = 
-FLaC__SSE_OS_TRUE = #
-FLaC__SYS_DARWIN_FALSE = 
-FLaC__SYS_DARWIN_TRUE = #
-FLaC__SYS_LINUX_FALSE = 
-FLaC__SYS_LINUX_TRUE = #
-FLaC__USE_3DNOW_FALSE = #
-FLaC__USE_3DNOW_TRUE = 
-FLaC__USE_ALTIVEC_FALSE = #
-FLaC__USE_ALTIVEC_TRUE = 
-FLaC__WITH_CPPLIBS_FALSE = #
-FLaC__WITH_CPPLIBS_TRUE = 
-GAS = gas
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
-LIBICONV = 
-LIBOBJS = 
-LIBS = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBICONV = 
-LTLIBOBJS = 
-MAINT = #
-MAINTAINER_MODE_FALSE = 
-MAINTAINER_MODE_TRUE = #
-MAKEINFO = ${SHELL} /home/vulkan/xbmc/sources/paplayer/flac-1.2.1/missing --run makeinfo
-MINGW_WINSOCK_LIBS = 
-NASM = 
-OBJEXT = o
-OBJ_FORMAT = elf
-OGG_CFLAGS = 
-OGG_LIBS =  -logg
-PACKAGE = flac
-PACKAGE_BUGREPORT = 
-PACKAGE_NAME = 
-PACKAGE_STRING = 
-PACKAGE_TARNAME = 
-PACKAGE_VERSION = 
-PATH_SEPARATOR = :
-RANLIB = ranlib
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 1.2.1
-XMMS_CFLAGS = 
-XMMS_CONFIG = no
-XMMS_DATA_DIR = 
-XMMS_EFFECT_PLUGIN_DIR = 
-XMMS_GENERAL_PLUGIN_DIR = 
-XMMS_INPUT_PLUGIN_DIR = 
-XMMS_LIBS = 
-XMMS_OUTPUT_PLUGIN_DIR = 
-XMMS_PLUGIN_DIR = 
-XMMS_VERSION = 
-XMMS_VISUALIZATION_PLUGIN_DIR = 
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = 
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnuaout
-build_alias = 
-build_cpu = i686
-build_os = linux-gnuaout
-build_vendor = pc
-datadir = ${prefix}/share
-exec_prefix = ${prefix}
-host = i686-pc-linux-gnuaout
-host_alias = 
-host_cpu = i686
-host_os = linux-gnuaout
-host_vendor = pc
-includedir = ${prefix}/include
-infodir = ${prefix}/share/info
-install_sh = /home/vulkan/xbmc/sources/paplayer/flac-1.2.1/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localstatedir = ${prefix}/var
-mandir = ${prefix}/share/man
-oldincludedir = /usr/include
-prefix = /usr/local
-program_transform_name = s,x,x,
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target_alias = 
-
-EXTRA_DIST = \
-	config.mk \
-	exe.mk \
-	lib.mk
-
-subdir = build
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: # Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  build/Makefile
-Makefile: # $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

Deleted: branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/config.log
===================================================================
--- branches/linuxport/sources/paplayer/flac-1.2.1/config.log	2008-07-14 20:32:47 UTC (rev 14088)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/config.log	2008-07-14 22:49:42 UTC (rev 14094)
@@ -1,1159 +0,0 @@
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by configure, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  $ ./configure 
-
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = vulkan-laptop
-uname -m = i686
-uname -r = 2.6.22-14-generic
-uname -s = Linux
-uname -v = #1 SMP Sun Oct 14 23:05:12 GMT 2007
-
-/usr/bin/uname -p = unknown
-/bin/uname -X     = unknown
-
-/bin/arch              = unknown
-/usr/bin/arch -k       = unknown
-/usr/convex/getsysinfo = unknown
-/usr/bin/hostinfo      = unknown
-/bin/machine           = unknown
-/usr/bin/oslevel       = unknown
-/bin/universe          = unknown
-
-PATH: /usr/local/sbin
-PATH: /usr/local/bin
-PATH: /usr/sbin
-PATH: /usr/bin
-PATH: /sbin
-PATH: /bin
-PATH: /usr/games
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-configure:2065: checking for a BSD-compatible install
-configure:2121: result: /usr/bin/install -c
-configure:2132: checking whether build environment is sane
-configure:2175: result: yes
-configure:2208: checking for gawk
-configure:2224: found /usr/bin/gawk
-configure:2235: result: gawk
-configure:2246: checking whether make sets $(MAKE)
-configure:2267: result: yes
-configure:2450: checking whether to enable maintainer-specific portions of Makefiles
-configure:2459: result: no
-configure:2556: checking build system type
-configure:2574: result: i686-pc-linux-gnuaout
-configure:2596: checking host system type
-configure:2611: result: i686-pc-linux-gnuaout
-configure:2645: checking for style of include used by make
-configure:2673: result: GNU
-configure:2746: checking for gcc
-configure:2762: found /usr/bin/gcc
-configure:2773: result: gcc
-configure:3011: checking for C compiler version
-configure:3018: gcc --version >&5
-gcc (GCC) 4.1.3 20070929 (prerelease) (Ubuntu 4.1.2-16ubuntu2)
-Copyright (C) 2006 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-configure:3021: $? = 0
-configure:3028: gcc -v >&5
-Using built-in specs.
-Target: i486-linux-gnu
-Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.1.3 --program-suffix=-4.1 --enable-__cxa_atexit --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --enable-checking=release i486-linux-gnu
-Thread model: posix
-gcc version 4.1.3 20070929 (prerelease) (Ubuntu 4.1.2-16ubuntu2)
-configure:3031: $? = 0
-configure:3038: gcc -V >&5
-gcc: '-V' option must have argument
-configure:3041: $? = 1
-configure:3064: checking for C compiler default output file name
-configure:3091: gcc    conftest.c  >&5
-configure:3094: $? = 0
-configure:3132: result: a.out
-configure:3149: checking whether the C compiler works
-configure:3159: ./a.out
-configure:3162: $? = 0
-configure:3179: result: yes
-configure:3186: checking whether we are cross compiling
-configure:3188: result: no
-configure:3191: checking for suffix of executables
-configure:3198: gcc -o conftest    conftest.c  >&5
-configure:3201: $? = 0
-configure:3225: result: 
-configure:3231: checking for suffix of object files
-configure:3257: gcc -c   conftest.c >&5
-configure:3260: $? = 0
-configure:3283: result: o
-configure:3287: checking whether we are using the GNU C compiler
-configure:3316: gcc -c   conftest.c >&5
-configure:3322: $? = 0
-configure:3339: result: yes
-configure:3344: checking whether gcc accepts -g
-configure:3374: gcc -c -g  conftest.c >&5
-configure:3380: $? = 0
-configure:3479: result: yes
-configure:3496: checking for gcc option to accept ISO C89
-configure:3570: gcc  -c -g -O2  conftest.c >&5
-configure:3576: $? = 0
-configure:3599: result: none needed
-configure:3619: checking dependency style of gcc
-configure:3702: result: gcc3
-configure:3719: checking for a sed that does not truncate output
-configure:3773: result: /bin/sed
-configure:3776: checking for grep that handles long lines and -e
-configure:3850: result: /bin/grep
-configure:3855: checking for egrep
-configure:3933: result: /bin/grep -E
-configure:3949: checking for ld used by gcc
-configure:4016: result: /usr/bin/ld
-configure:4025: checking if the linker (/usr/bin/ld) is GNU ld
-configure:4040: result: yes
-configure:4045: checking for /usr/bin/ld option to reload object files
-configure:4052: result: -r
-configure:4070: checking for BSD-compatible nm
-configure:4112: result: /usr/bin/nm -B
-configure:4116: checking whether ln -s works
-configure:4120: result: yes
-configure:4127: checking how to recognise dependent libraries
-configure:4299: result: pass_all
-configure:4510: checking how to run the C preprocessor
-configure:4550: gcc -E  conftest.c
-configure:4556: $? = 0
-configure:4587: gcc -E  conftest.c
-conftest.c:10:28: error: ac_nonexistent.h: No such file or directory
-configure:4593: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "flac"
-| #define VERSION "1.2.1"
-| /* end confdefs.h.  */
-| #include <ac_nonexistent.h>
-configure:4626: result: gcc -E
-configure:4655: gcc -E  conftest.c
-configure:4661: $? = 0
-configure:4692: gcc -E  conftest.c
-conftest.c:10:28: error: ac_nonexistent.h: No such file or directory
-configure:4698: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "flac"
-| #define VERSION "1.2.1"
-| /* end confdefs.h.  */
-| #include <ac_nonexistent.h>
-configure:4736: checking for ANSI C header files
-configure:4766: gcc -c -g -O2  conftest.c >&5
-configure:4772: $? = 0
-configure:4871: gcc -o conftest -g -O2   conftest.c  >&5
-configure:4874: $? = 0
-configure:4880: ./conftest
-configure:4883: $? = 0
-configure:4900: result: yes
-configure:4924: checking for sys/types.h
-configure:4945: gcc -c -g -O2  conftest.c >&5
-configure:4951: $? = 0
-configure:4967: result: yes
-configure:4924: checking for sys/stat.h
-configure:4945: gcc -c -g -O2  conftest.c >&5
-configure:4951: $? = 0
-configure:4967: result: yes
-configure:4924: checking for stdlib.h
-configure:4945: gcc -c -g -O2  conftest.c >&5
-configure:4951: $? = 0
-configure:4967: result: yes
-configure:4924: checking for string.h
-configure:4945: gcc -c -g -O2  conftest.c >&5
-configure:4951: $? = 0
-configure:4967: result: yes
-configure:4924: checking for memory.h
-configure:4945: gcc -c -g -O2  conftest.c >&5
-configure:4951: $? = 0
-configure:4967: result: yes
-configure:4924: checking for strings.h
-configure:4945: gcc -c -g -O2  conftest.c >&5
-configure:4951: $? = 0
-configure:4967: result: yes
-configure:4924: checking for inttypes.h
-configure:4945: gcc -c -g -O2  conftest.c >&5
-configure:4951: $? = 0
-configure:4967: result: yes
-configure:4924: checking for stdint.h
-configure:4945: gcc -c -g -O2  conftest.c >&5
-configure:4951: $? = 0
-configure:4967: result: yes
-configure:4924: checking for unistd.h
-configure:4945: gcc -c -g -O2  conftest.c >&5
-configure:4951: $? = 0
-configure:4967: result: yes
-configure:4994: checking dlfcn.h usability
-configure:5011: gcc -c -g -O2  conftest.c >&5
-configure:5017: $? = 0
-configure:5031: result: yes
-configure:5035: checking dlfcn.h presence
-configure:5050: gcc -E  conftest.c
-configure:5056: $? = 0
-configure:5070: result: yes
-configure:5098: checking for dlfcn.h
-configure:5106: result: yes
-configure:5177: checking for g++
-configure:5193: found /usr/bin/g++
-configure:5204: result: g++
-configure:5235: checking for C++ compiler version
-configure:5242: g++ --version >&5
-g++ (GCC) 4.1.3 20070929 (prerelease) (Ubuntu 4.1.2-16ubuntu2)
-Copyright (C) 2006 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-configure:5245: $? = 0
-configure:5252: g++ -v >&5
-Using built-in specs.
-Target: i486-linux-gnu
-Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.1.3 --program-suffix=-4.1 --enable-__cxa_atexit --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --enable-checking=release i486-linux-gnu
-Thread model: posix
-gcc version 4.1.3 20070929 (prerelease) (Ubuntu 4.1.2-16ubuntu2)
-configure:5255: $? = 0
-configure:5262: g++ -V >&5
-g++: '-V' option must have argument
-configure:5265: $? = 1
-configure:5268: checking whether we are using the GNU C++ compiler
-configure:5297: g++ -c   conftest.cpp >&5
-configure:5303: $? = 0
-configure:5320: result: yes
-configure:5325: checking whether g++ accepts -g
-configure:5355: g++ -c -g  conftest.cpp >&5
-configure:5361: $? = 0
-configure:5460: result: yes
-configure:5485: checking dependency style of g++
-configure:5568: result: gcc3
-configure:5595: checking how to run the C++ preprocessor
-configure:5631: g++ -E  conftest.cpp
-configure:5637: $? = 0
-configure:5668: g++ -E  conftest.cpp
-conftest.cpp:21:28: error: ac_nonexistent.h: No such file or directory
-configure:5674: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "flac"
-| #define VERSION "1.2.1"
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_DLFCN_H 1
-| /* end confdefs.h.  */
-| #include <ac_nonexistent.h>
-configure:5707: result: g++ -E
-configure:5736: g++ -E  conftest.cpp
-configure:5742: $? = 0
-configure:5773: g++ -E  conftest.cpp
-conftest.cpp:21:28: error: ac_nonexistent.h: No such file or directory
-configure:5779: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "flac"
-| #define VERSION "1.2.1"
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_DLFCN_H 1
-| /* end confdefs.h.  */
-| #include <ac_nonexistent.h>
-configure:5872: checking for g77
-configure:5902: result: no
-configure:5872: checking for xlf
-configure:5902: result: no
-configure:5872: checking for f77
-configure:5902: result: no
-configure:5872: checking for frt
-configure:5902: result: no
-configure:5872: checking for pgf77
-configure:5902: result: no
-configure:5872: checking for cf77
-configure:5902: result: no
-configure:5872: checking for fort77
-configure:5902: result: no
-configure:5872: checking for fl32
-configure:5902: result: no
-configure:5872: checking for af77
-configure:5902: result: no
-configure:5872: checking for xlf90
-configure:5902: result: no
-configure:5872: checking for f90
-configure:5902: result: no
-configure:5872: checking for pgf90
-configure:5902: result: no
-configure:5872: checking for pghpf
-configure:5902: result: no
-configure:5872: checking for epcf90
-configure:5902: result: no
-configure:5872: checking for gfortran
-configure:5902: result: no
-configure:5872: checking for g95
-configure:5902: result: no
-configure:5872: checking for xlf95
-configure:5902: result: no
-configure:5872: checking for f95
-configure:5902: result: no
-configure:5872: checking for fort
-configure:5902: result: no
-configure:5872: checking for ifort
-configure:5902: result: no
-configure:5872: checking for ifc
-configure:5902: result: no
-configure:5872: checking for efc
-configure:5902: result: no
-configure:5872: checking for pgf95
-configure:5902: result: no
-configure:5872: checking for lf95
-configure:5902: result: no
-configure:5872: checking for ftn
-configure:5902: result: no
-configure:5929: checking for Fortran 77 compiler version
-configure:5936:  --version >&5
-./configure: line 5937: --version: command not found
-configure:5939: $? = 127
-configure:5946:  -v >&5
-./configure: line 5947: -v: command not found
-configure:5949: $? = 127
-configure:5956:  -V >&5
-./configure: line 5957: -V: command not found
-configure:5959: $? = 127
-configure:5967: checking whether we are using the GNU Fortran 77 compiler
-configure:5986:  -c  conftest.F >&5
-./configure: line 5987: -c: command not found
-configure:5992: $? = 127
-configure: failed program was:
-|       program main
-| #ifndef __GNUC__
-|        choke me
-| #endif
-| 
-|       end
-configure:6009: result: no
-configure:6015: checking whether  accepts -g
-configure:6032:  -c -g conftest.f >&5
-./configure: line 6033: -c: command not found
-configure:6038: $? = 127
-configure: failed program was:
-|       program main
-| 
-|       end
-configure:6054: result: no
-configure:6084: checking the maximum length of command line arguments
-configure:6176: result: 32768
-configure:6187: checking command to parse /usr/bin/nm -B output from gcc object
-configure:6283: gcc -c -g -O2  conftest.c >&5
-configure:6286: $? = 0
-configure:6290: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ 	]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ 	][ 	]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' \> conftest.nm
-configure:6293: $? = 0
-configure:6345: gcc -o conftest -g -O2   conftest.c conftstm.o >&5
-configure:6348: $? = 0
-configure:6386: result: ok
-configure:6390: checking for objdir
-configure:6405: result: .libs
-configure:6497: checking for ar
-configure:6513: found /usr/bin/ar
-configure:6524: result: ar
-configure:6593: checking for ranlib
-configure:6609: found /usr/bin/ranlib
-configure:6620: result: ranlib
-configure:6689: checking for strip
-configure:6705: found /usr/bin/strip
-configure:6716: result: strip
-configure:7017: checking if gcc static flag  works
-configure:7045: result: yes
-configure:7063: checking if gcc supports -fno-rtti -fno-exceptions
-configure:7081: gcc -c -g -O2  -fno-rtti -fno-exceptions conftest.c >&5
-cc1: warning: command line option "-fno-rtti" is valid for C++/ObjC++ but not for C
-configure:7085: $? = 0
-configure:7098: result: no
-configure:7113: checking for gcc option to produce PIC
-configure:7317: result: -fPIC
-configure:7325: checking if gcc PIC flag -fPIC works
-configure:7343: gcc -c -g -O2  -fPIC -DPIC conftest.c >&5
-configure:7347: $? = 0
-configure:7360: result: yes
-configure:7384: checking if gcc supports -c -o file.o
-configure:7405: gcc -c -g -O2  -o out/conftest2.o conftest.c >&5
-configure:7409: $? = 0
-configure:7431: result: yes
-configure:7457: checking whether the gcc linker (/usr/bin/ld) supports shared libraries
-configure:8348: result: yes
-configure:8374: checking whether -lc should be explicitly linked in
-configure:8379: gcc -c -g -O2  conftest.c >&5
-configure:8382: $? = 0
-configure:8396: gcc -shared conftest.o  -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| grep  -lc  \>/dev/null 2\>\&1
-configure:8399: $? = 0
-configure:8411: result: no
-configure:8419: checking dynamic linker characteristics
-configure:8982: result: no
-configure:8986: checking how to hardcode library paths into programs
-configure:9011: result: immediate
-configure:9025: checking whether stripping libraries is possible
-configure:9030: result: yes
-configure:9827: checking if libtool supports shared libraries
-configure:9829: result: no
-configure:9832: checking whether to build shared libraries
-configure:9853: result: no
-configure:9856: checking whether to build static libraries
-configure:9860: result: yes
-configure:9952: creating libtool
-configure:10530: checking for ld used by g++
-configure:10597: result: /usr/bin/ld
-configure:10606: checking if the linker (/usr/bin/ld) is GNU ld
-configure:10621: result: yes
-configure:10672: checking whether the g++ linker (/usr/bin/ld) supports shared libraries
-configure:11555: result: yes
-configure:11573: g++ -c -g -O2  conftest.cc >&5
-configure:11576: $? = 0
-configure:11672: checking for g++ option to produce PIC
-configure:11940: result: -fPIC
-configure:11948: checking if g++ PIC flag -fPIC works
-configure:11966: g++ -c -g -O2  -fPIC -DPIC conftest.cc >&5
-configure:11970: $? = 0
-configure:11983: result: yes
-configure:12007: checking if g++ supports -c -o file.o
-configure:12028: g++ -c -g -O2  -o out/conftest2.o conftest.cc >&5
-configure:12032: $? = 0
-configure:12054: result: yes
-configure:12080: checking whether the g++ linker (/usr/bin/ld) supports shared libraries
-configure:12105: result: yes
-configure:12176: checking dynamic linker characteristics
-configure:12739: result: no
-configure:12743: checking how to hardcode library paths into programs
-configure:12768: result: immediate
-configure:12782: checking whether stripping libraries is possible
-configure:12787: result: yes
-configure:20378: checking for C++ compiler version
-configure:20385: g++ --version >&5
-g++ (GCC) 4.1.3 20070929 (prerelease) (Ubuntu 4.1.2-16ubuntu2)
-Copyright (C) 2006 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-configure:20388: $? = 0
-configure:20395: g++ -v >&5
-Using built-in specs.
-Target: i486-linux-gnu
-Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.1.3 --program-suffix=-4.1 --enable-__cxa_atexit --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --enable-checking=release i486-linux-gnu
-Thread model: posix
-gcc version 4.1.3 20070929 (prerelease) (Ubuntu 4.1.2-16ubuntu2)
-configure:20398: $? = 0
-configure:20405: g++ -V >&5
-g++: '-V' option must have argument
-configure:20408: $? = 1
-configure:20411: checking whether we are using the GNU C++ compiler
-configure:20463: result: yes
-configure:20468: checking whether g++ accepts -g
-configure:20603: result: yes
-configure:20628: checking dependency style of g++
-configure:20711: result: gcc3
-configure:20728: checking whether make sets $(MAKE)
-configure:20749: result: yes
-configure:20766: checking for special C compiler options needed for large files
-configure:20859: result: no
-configure:20865: checking for _FILE_OFFSET_BITS value needed for large files
-configure:20900: gcc -c -g -O2  conftest.c >&5
-conftest.c:27: warning: left shift count >= width of type
-conftest.c:27: warning: left shift count >= width of type
-conftest.c:29: error: size of array 'off_t_is_large' is negative
-configure:20906: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "flac"
-| #define VERSION "1.2.1"
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_DLFCN_H 1
-| /* end confdefs.h.  */
-| #include <sys/types.h>
-|  /* Check that off_t can represent 2**63 - 1 correctly.
-|     We can't simply define LARGE_OFF_T to be 9223372036854775807,
-|     since some C++ compilers masquerading as C compilers
-|     incorrectly reject 9223372036854775807.  */
-| #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-|   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-| 		       && LARGE_OFF_T % 2147483647 == 1)
-| 		      ? 1 : -1];
-| int
-| main ()
-| {
-| 
-|   ;
-|   return 0;
-| }
-configure:20950: gcc -c -g -O2  conftest.c >&5
-configure:20956: $? = 0
-configure:20974: result: 64
-configure:21109: checking for _LARGEFILE_SOURCE value needed for large files
-configure:21138: gcc -o conftest -g -O2   conftest.c  >&5
-configure:21144: $? = 0
-configure:21210: result: no
-configure:21234: checking for void*
-configure:21264: gcc -c -g -O2  conftest.c >&5
-configure:21270: $? = 0
-configure:21285: result: yes
-configure:21292: checking size of void*
-configure:21594: gcc -o conftest -g -O2   conftest.c  >&5
-configure:21597: $? = 0
-configure:21603: ./conftest
-configure:21606: $? = 0
-configure:21629: result: 4
-configure:21644: checking whether byte ordering is bigendian
-configure:21677: gcc -c -g -O2  conftest.c >&5
-configure:21683: $? = 0
-configure:21715: gcc -c -g -O2  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:31: error: 'not' undeclared (first use in this function)
-conftest.c:31: error: (Each undeclared identifier is reported only once
-conftest.c:31: error: for each function it appears in.)
-conftest.c:31: error: expected ';' before 'big'
-configure:21721: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "flac"
-| #define VERSION "1.2.1"
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_DLFCN_H 1
-| #define _FILE_OFFSET_BITS 64
-| #define HAVE_FSEEKO 1
-| #define SIZEOF_VOIDP 4
-| /* end confdefs.h.  */
-| #include <sys/types.h>
-| #include <sys/param.h>
-| 
-| int
-| main ()
-| {
-| #if BYTE_ORDER != BIG_ENDIAN
-|  not big endian
-| #endif
-| 
-|   ;
-|   return 0;
-| }
-configure:21861: result: no
-configure:21881: checking for socklen_t
-configure:21911: gcc -c -g -O2  conftest.c >&5
-configure:21917: $? = 0
-configure:21932: result: yes
-configure:21948: checking for getopt_long
-configure:22004: gcc -o conftest -g -O2   conftest.c  >&5
-configure:22010: $? = 0
-configure:22028: result: yes
-configure:22378: checking for doxygen
-configure:22408: result: no
-configure:22500: checking for xmms-config
-configure:22531: result: no
-configure:22643: checking for XMMS - version >= 0.9.5.1
-configure:22651: result: no
-configure:22678: WARNING: *** XMMS >= 0.9.5.1 not installed - XMMS support will not be built
-configure:22787: checking for Ogg
-configure:22827: gcc -o conftest -g -O2    conftest.c   -logg >&5
-configure:22830: $? = 0
-configure:22836: ./conftest
-configure:22839: $? = 0
-configure:22859: result: yes
-configure:23000: checking for ld used by GCC
-configure:23064: result: /usr/bin/ld
-configure:23073: checking if the linker (/usr/bin/ld) is GNU ld
-configure:23086: result: yes
-configure:23093: checking for shared library run path origin
-configure:23106: result: done
-configure:23536: checking for iconv
-configure:23568: gcc -o conftest -g -O2   conftest.c  >&5
-configure:23574: $? = 0
-configure:23644: result: yes
-configure:23667: checking for iconv declaration
-configure:23706: gcc -c -g -O2  conftest.c >&5
-configure:23712: $? = 0
-configure:23731: result: 
-         extern size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-configure:23742: checking for nl_langinfo and CODESET
-configure:23768: gcc -o conftest -g -O2   conftest.c  >&5
-configure:23774: $? = 0
-configure:23792: result: yes
-configure:23807: checking for docbook-to-man
-configure:23837: result: no
-configure:23807: checking for docbook2man
-configure:23837: result: no
-configure:23869: checking for nasm
-configure:23899: result: no
-configure:23931: checking for as
-configure:23958: result: as
-configure:23974: checking for gas
-configure:24004: result: no
-configure:24373: creating ./config.status
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by config.status, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status 
-
-on vulkan-laptop
-
-config.status:803: creating Makefile
-config.status:938: WARNING:  Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/Makefile
-config.status:938: WARNING:  src/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/libFLAC/Makefile
-config.status:938: WARNING:  src/libFLAC/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/libFLAC/flac.pc
-config.status:803: creating src/libFLAC/ia32/Makefile
-config.status:938: WARNING:  src/libFLAC/ia32/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/libFLAC/ppc/Makefile
-config.status:938: WARNING:  src/libFLAC/ppc/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/libFLAC/ppc/as/Makefile
-config.status:938: WARNING:  src/libFLAC/ppc/as/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/libFLAC/ppc/gas/Makefile
-config.status:938: WARNING:  src/libFLAC/ppc/gas/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/libFLAC/include/Makefile
-config.status:938: WARNING:  src/libFLAC/include/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/libFLAC/include/private/Makefile
-config.status:938: WARNING:  src/libFLAC/include/private/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/libFLAC/include/protected/Makefile
-config.status:938: WARNING:  src/libFLAC/include/protected/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/libFLAC++/Makefile
-config.status:938: WARNING:  src/libFLAC++/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/libFLAC++/flac++.pc
-config.status:803: creating src/flac/Makefile
-config.status:938: WARNING:  src/flac/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/metaflac/Makefile
-config.status:938: WARNING:  src/metaflac/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/monkeys_audio_utilities/Makefile
-config.status:938: WARNING:  src/monkeys_audio_utilities/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/monkeys_audio_utilities/flac_mac/Makefile
-config.status:938: WARNING:  src/monkeys_audio_utilities/flac_mac/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/monkeys_audio_utilities/flac_ren/Makefile
-config.status:938: WARNING:  src/monkeys_audio_utilities/flac_ren/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/plugin_common/Makefile
-config.status:938: WARNING:  src/plugin_common/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/plugin_winamp2/Makefile
-config.status:938: WARNING:  src/plugin_winamp2/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/plugin_winamp2/include/Makefile
-config.status:938: WARNING:  src/plugin_winamp2/include/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/plugin_winamp2/include/winamp2/Makefile
-config.status:938: WARNING:  src/plugin_winamp2/include/winamp2/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/plugin_xmms/Makefile
-config.status:938: WARNING:  src/plugin_xmms/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/share/Makefile
-config.status:938: WARNING:  src/share/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/share/getopt/Makefile
-config.status:938: WARNING:  src/share/getopt/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/share/grabbag/Makefile
-config.status:938: WARNING:  src/share/grabbag/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/share/replaygain_analysis/Makefile
-config.status:938: WARNING:  src/share/replaygain_analysis/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/share/replaygain_synthesis/Makefile
-config.status:938: WARNING:  src/share/replaygain_synthesis/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/share/replaygain_synthesis/include/Makefile
-config.status:938: WARNING:  src/share/replaygain_synthesis/include/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/share/replaygain_synthesis/include/private/Makefile
-config.status:938: WARNING:  src/share/replaygain_synthesis/include/private/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/share/utf8/Makefile
-config.status:938: WARNING:  src/share/utf8/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/test_grabbag/Makefile
-config.status:938: WARNING:  src/test_grabbag/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/test_grabbag/cuesheet/Makefile
-config.status:938: WARNING:  src/test_grabbag/cuesheet/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/test_grabbag/picture/Makefile
-config.status:938: WARNING:  src/test_grabbag/picture/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/test_libs_common/Makefile
-config.status:938: WARNING:  src/test_libs_common/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/test_libFLAC/Makefile
-config.status:938: WARNING:  src/test_libFLAC/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/test_libFLAC++/Makefile
-config.status:938: WARNING:  src/test_libFLAC++/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/test_seeking/Makefile
-config.status:938: WARNING:  src/test_seeking/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating src/test_streams/Makefile
-config.status:938: WARNING:  src/test_streams/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating examples/Makefile
-config.status:938: WARNING:  examples/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating examples/c/Makefile
-config.status:938: WARNING:  examples/c/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating examples/c/decode/Makefile
-config.status:938: WARNING:  examples/c/decode/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating examples/c/decode/file/Makefile
-config.status:938: WARNING:  examples/c/decode/file/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating examples/c/encode/Makefile
-config.status:938: WARNING:  examples/c/encode/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating examples/c/encode/file/Makefile
-config.status:938: WARNING:  examples/c/encode/file/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating examples/cpp/Makefile
-config.status:938: WARNING:  examples/cpp/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating examples/cpp/decode/Makefile
-config.status:938: WARNING:  examples/cpp/decode/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating examples/cpp/decode/file/Makefile
-config.status:938: WARNING:  examples/cpp/decode/file/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating examples/cpp/encode/Makefile
-config.status:938: WARNING:  examples/cpp/encode/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating examples/cpp/encode/file/Makefile
-config.status:938: WARNING:  examples/cpp/encode/file/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating include/Makefile
-config.status:938: WARNING:  include/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating include/FLAC/Makefile
-config.status:938: WARNING:  include/FLAC/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating include/FLAC++/Makefile
-config.status:938: WARNING:  include/FLAC++/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating include/share/Makefile
-config.status:938: WARNING:  include/share/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating include/share/grabbag/Makefile
-config.status:938: WARNING:  include/share/grabbag/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating include/test_libs_common/Makefile
-config.status:938: WARNING:  include/test_libs_common/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating doc/Makefile
-config.status:938: WARNING:  doc/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating doc/html/Makefile
-config.status:938: WARNING:  doc/html/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating doc/html/images/Makefile
-config.status:938: WARNING:  doc/html/images/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating doc/html/images/hw/Makefile
-config.status:938: WARNING:  doc/html/images/hw/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating doc/html/ru/Makefile
-config.status:938: WARNING:  doc/html/ru/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating m4/Makefile
-config.status:938: WARNING:  m4/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating man/Makefile
-config.status:938: WARNING:  man/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating test/Makefile
-config.status:938: WARNING:  test/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating test/cuesheets/Makefile
-config.status:938: WARNING:  test/cuesheets/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating test/flac-to-flac-metadata-test-files/Makefile
-config.status:938: WARNING:  test/flac-to-flac-metadata-test-files/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating test/metaflac-test-files/Makefile
-config.status:938: WARNING:  test/metaflac-test-files/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating test/pictures/Makefile
-config.status:938: WARNING:  test/pictures/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating build/Makefile
-config.status:938: WARNING:  build/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating obj/Makefile
-config.status:938: WARNING:  obj/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating obj/debug/Makefile
-config.status:938: WARNING:  obj/debug/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating obj/debug/bin/Makefile
-config.status:938: WARNING:  obj/debug/bin/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating obj/debug/lib/Makefile
-config.status:938: WARNING:  obj/debug/lib/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating obj/release/Makefile
-config.status:938: WARNING:  obj/release/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating obj/release/bin/Makefile
-config.status:938: WARNING:  obj/release/bin/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating obj/release/lib/Makefile
-config.status:938: WARNING:  obj/release/lib/Makefile.in seems to ignore the --datarootdir setting
-config.status:803: creating config.h
-config.status:1084: executing depfiles commands
-
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-
-ac_cv_build=i686-pc-linux-gnuaout
-ac_cv_c_bigendian=no
-ac_cv_c_compiler_gnu=yes
-ac_cv_cxx_compiler_gnu=yes
-ac_cv_env_CCC_set=
-ac_cv_env_CCC_value=
-ac_cv_env_CC_set=
-ac_cv_env_CC_value=
-ac_cv_env_CFLAGS_set=
-ac_cv_env_CFLAGS_value=
-ac_cv_env_CPPFLAGS_set=
-ac_cv_env_CPPFLAGS_value=
-ac_cv_env_CPP_set=
-ac_cv_env_CPP_value=
-ac_cv_env_CXXCPP_set=
-ac_cv_env_CXXCPP_value=
-ac_cv_env_CXXFLAGS_set=
-ac_cv_env_CXXFLAGS_value=
-ac_cv_env_CXX_set=
-ac_cv_env_CXX_value=
-ac_cv_env_F77_set=
-ac_cv_env_F77_value=
-ac_cv_env_FFLAGS_set=
-ac_cv_env_FFLAGS_value=
-ac_cv_env_LDFLAGS_set=
-ac_cv_env_LDFLAGS_value=
-ac_cv_env_LIBS_set=
-ac_cv_env_LIBS_value=
-ac_cv_env_build_alias_set=
-ac_cv_env_build_alias_value=
-ac_cv_env_host_alias_set=
-ac_cv_env_host_alias_value=
-ac_cv_env_target_alias_set=
-ac_cv_env_target_alias_value=
-ac_cv_f77_compiler_gnu=no
-ac_cv_func_getopt_long=yes
-ac_cv_header_dlfcn_h=yes
-ac_cv_header_inttypes_h=yes
-ac_cv_header_memory_h=yes
-ac_cv_header_stdc=yes
-ac_cv_header_stdint_h=yes
-ac_cv_header_stdlib_h=yes
-ac_cv_header_string_h=yes
-ac_cv_header_strings_h=yes
-ac_cv_header_sys_stat_h=yes
-ac_cv_header_sys_types_h=yes
-ac_cv_header_unistd_h=yes
-ac_cv_host=i686-pc-linux-gnuaout
-ac_cv_objext=o
-ac_cv_path_EGREP='/bin/grep -E'
-ac_cv_path_GREP=/bin/grep
-ac_cv_path_XMMS_CONFIG=no
-ac_cv_path_install='/usr/bin/install -c'
-ac_cv_prog_AS=as
-ac_cv_prog_AWK=gawk
-ac_cv_prog_CPP='gcc -E'
-ac_cv_prog_CXXCPP='g++ -E'
-ac_cv_prog_ac_ct_AR=ar
-ac_cv_prog_ac_ct_CC=gcc
-ac_cv_prog_ac_ct_CXX=g++
-ac_cv_prog_ac_ct_RANLIB=ranlib
-ac_cv_prog_ac_ct_STRIP=strip
-ac_cv_prog_cc_c89=
-ac_cv_prog_cc_g=yes
-ac_cv_prog_cxx_g=yes
-ac_cv_prog_f77_g=no
-ac_cv_prog_make_make_set=yes
-ac_cv_sizeof_voidp=4
-ac_cv_sys_file_offset_bits=64
-ac_cv_sys_largefile_CC=no
-ac_cv_sys_largefile_source=no
-ac_cv_type_socklen_t=yes
-ac_cv_type_voidp=yes
-acl_cv_hardcode_direct=no
-acl_cv_hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-acl_cv_hardcode_libdir_separator=
-acl_cv_hardcode_minus_L=no
-acl_cv_libext=a
-acl_cv_path_LD=/usr/bin/ld
-acl_cv_prog_gnu_ld=yes
-acl_cv_rpath=done
-acl_cv_shlibext=so
-acl_cv_wl=-Wl,
-am_cv_CC_dependencies_compiler_type=gcc3
-am_cv_CXX_dependencies_compiler_type=gcc3
-am_cv_func_iconv=yes
-am_cv_langinfo_codeset=yes
-am_cv_lib_iconv=no
-am_cv_proto_iconv='extern size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);'
-am_cv_proto_iconv_arg1=
-lt_cv_deplibs_check_method=pass_all
-lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_ld_reload_flag=-r
-lt_cv_objdir=.libs
-lt_cv_path_LD=/usr/bin/ld
-lt_cv_path_LDCXX=/usr/bin/ld
-lt_cv_path_NM='/usr/bin/nm -B'
-lt_cv_path_SED=/bin/sed
-lt_cv_prog_compiler_c_o=yes
-lt_cv_prog_compiler_c_o_CXX=yes
-lt_cv_prog_compiler_rtti_exceptions=no
-lt_cv_prog_gnu_ld=yes
-lt_cv_prog_gnu_ldcxx=yes
-lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[ 	]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ 	][ 	]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\'''
-lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \([^ ]*\) $/  {\"\1\", (lt_ptr) 0},/p'\'' -e '\''s/^[BCDEGRST] \([^ ]*\) \([^ ]*\)$/  {"\2", (lt_ptr) \&\2},/p'\'''
-lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^. .* \(.*\)$/extern int \1;/p'\'''
-lt_cv_sys_max_cmd_len=32768
-lt_lt_cv_prog_compiler_c_o='"yes"'
-lt_lt_cv_prog_compiler_c_o_CXX='"yes"'
-lt_lt_cv_sys_global_symbol_pipe='"sed -n -e '\''s/^.*[ 	]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ 	][ 	]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'\''"'
-lt_lt_cv_sys_global_symbol_to_c_name_address='"sed -n -e '\''s/^: \\([^ ]*\\) \$/  {\\\"\\1\\\", (lt_ptr) 0},/p'\'' -e '\''s/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/  {\"\\2\", (lt_ptr) \\&\\2},/p'\''"'
-lt_lt_cv_sys_global_symbol_to_cdecl='"sed -n -e '\''s/^. .* \\(.*\\)\$/extern int \\1;/p'\''"'
-
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-
-ACLOCAL='${SHELL} /home/vulkan/xbmc/sources/paplayer/flac-1.2.1/missing --run aclocal-1.7'
-ACLOCAL_AMFLAGS='-I m4'
-AMDEPBACKSLASH='\'
-AMDEP_FALSE='#'
-AMDEP_TRUE=''
-AMTAR='${SHELL} /home/vulkan/xbmc/sources/paplayer/flac-1.2.1/missing --run tar'
-AR='ar'
-AS='gas'
-AUTOCONF='${SHELL} /home/vulkan/xbmc/sources/paplayer/flac-1.2.1/missing --run autoconf'
-AUTOHEADER='${SHELL} /home/vulkan/xbmc/sources/paplayer/flac-1.2.1/missing --run autoheader'
-AUTOMAKE='${SHELL} /home/vulkan/xbmc/sources/paplayer/flac-1.2.1/missing --run automake-1.7'
-AWK='gawk'
-CC='gcc'
-CCAS='$(CC)'
-CCASFLAGS='$(CFLAGS)'
-CCDEPMODE='depmode=gcc3'
-CFLAGS='-O3 -funroll-loops -finline-functions -Wall -W -Winline -g -O2'
-CPP='gcc -E'
-CPPFLAGS='-DFLaC__INLINE=__inline__ -DNDEBUG -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include '
-CXX='g++'
-CXXCPP='g++ -E'
-CXXDEPMODE='depmode=gcc3'
-CXXFLAGS='-g -O2'
-CYGPATH_W='echo'
-DEBUG_FALSE=''
-DEBUG_TRUE='#'
-DEFS='-DHAVE_CONFIG_H'
-DEPDIR='.deps'
-DOCBOOK_TO_MAN=''
-DOXYGEN=''
-ECHO='echo'
-ECHO_C=''
-ECHO_N='-n'
-ECHO_T=''
-EGREP='/bin/grep -E'
-EXEEXT=''
-F77=''
-FFLAGS=''
-FLAC__TEST_LEVEL='1'
-FLAC__TEST_WITH_VALGRIND='no'
-FLaC__CPU_IA32_FALSE='#'
-FLaC__CPU_IA32_TRUE=''
-FLaC__CPU_PPC_FALSE=''
-FLaC__CPU_PPC_TRUE='#'
-FLaC__CPU_SPARC_FALSE=''
-FLaC__CPU_SPARC_TRUE='#'
-FLaC__HAS_AS_FALSE=''
-FLaC__HAS_AS_TRUE='#'
-FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE=''
-FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE='#'
-FLaC__HAS_DOCBOOK_TO_MAN_FALSE=''
-FLaC__HAS_DOCBOOK_TO_MAN_TRUE='#'
-FLaC__HAS_DOXYGEN_FALSE=''
-FLaC__HAS_DOXYGEN_TRUE='#'
-FLaC__HAS_GAS_FALSE='#'
-FLaC__HAS_GAS_TRUE=''
-FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE=''
-FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE='#'
-FLaC__HAS_NASM_FALSE=''
-FLaC__HAS_NASM_TRUE='#'
-FLaC__HAS_OGG_FALSE='#'
-FLaC__HAS_OGG_TRUE=''
-FLaC__HAS_XMMS_FALSE=''
-FLaC__HAS_XMMS_TRUE='#'
-FLaC__INSTALL_XMMS_PLUGIN_LOCALLY_FALSE=''
-FLaC__INSTALL_XMMS_PLUGIN_LOCALLY_TRUE='#'
-FLaC__NO_ASM_FALSE=''
-FLaC__NO_ASM_TRUE='#'
-FLaC__SSE_OS_FALSE=''
-FLaC__SSE_OS_TRUE='#'
-FLaC__SYS_DARWIN_FALSE=''
-FLaC__SYS_DARWIN_TRUE='#'
-FLaC__SYS_LINUX_FALSE=''
-FLaC__SYS_LINUX_TRUE='#'
-FLaC__USE_3DNOW_FALSE='#'
-FLaC__USE_3DNOW_TRUE=''
-FLaC__USE_ALTIVEC_FALSE='#'
-FLaC__USE_ALTIVEC_TRUE=''
-FLaC__WITH_CPPLIBS_FALSE='#'
-FLaC__WITH_CPPLIBS_TRUE=''
-GAS='gas'
-GREP='/bin/grep'
-INSTALL_DATA='${INSTALL} -m 644'
-INSTALL_PROGRAM='${INSTALL}'
-INSTALL_SCRIPT='${INSTALL}'
-INSTALL_STRIP_PROGRAM='${SHELL} $(install_sh) -c -s'
-LDFLAGS=''
-LIBICONV=''
-LIBOBJS=''
-LIBS=''
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-LN_S='ln -s'
-LTLIBICONV=''
-LTLIBOBJS=''
-MAINT='#'
-MAINTAINER_MODE_FALSE=''
-MAINTAINER_MODE_TRUE='#'
-MAKEINFO='${SHELL} /home/vulkan/xbmc/sources/paplayer/flac-1.2.1/missing --run makeinfo'
-MINGW_WINSOCK_LIBS=''
-NASM=''
-OBJEXT='o'
-OBJ_FORMAT='elf'
-OGG_CFLAGS=''
-OGG_LIBS=' -logg'
-PACKAGE='flac'
-PACKAGE_BUGREPORT=''
-PACKAGE_NAME=''
-PACKAGE_STRING=''
-PACKAGE_TARNAME=''
-PACKAGE_VERSION=''
-PATH_SEPARATOR=':'
-RANLIB='ranlib'
-SET_MAKE=''
-SHELL='/bin/sh'
-STRIP='strip'
-VERSION='1.2.1'
-XMMS_CFLAGS=''
-XMMS_CONFIG='no'
-XMMS_DATA_DIR=''
-XMMS_EFFECT_PLUGIN_DIR=''
-XMMS_GENERAL_PLUGIN_DIR=''
-XMMS_INPUT_PLUGIN_DIR=''
-XMMS_LIBS=''
-XMMS_OUTPUT_PLUGIN_DIR=''
-XMMS_PLUGIN_DIR=''
-XMMS_VERSION=''
-XMMS_VISUALIZATION_PLUGIN_DIR=''
-ac_ct_CC='gcc'
-ac_ct_CXX='g++'
-ac_ct_F77=''
-am__fastdepCC_FALSE='#'
-am__fastdepCC_TRUE=''
-am__fastdepCXX_FALSE='#'
-am__fastdepCXX_TRUE=''
-am__include='include'
-am__leading_dot='.'
-am__quote=''
-bindir='${exec_prefix}/bin'
-build='i686-pc-linux-gnuaout'
-build_alias=''
-build_cpu='i686'
-build_os='linux-gnuaout'
-build_vendor='pc'
-datadir='${datarootdir}'
-datarootdir='${prefix}/share'
-docdir='${datarootdir}/doc/${PACKAGE}'
-dvidir='${docdir}'
-exec_prefix='${prefix}'
-host='i686-pc-linux-gnuaout'
-host_alias=''
-host_cpu='i686'
-host_os='linux-gnuaout'
-host_vendor='pc'
-htmldir='${docdir}'
-includedir='${prefix}/include'
-infodir='${datarootdir}/info'
-install_sh='/home/vulkan/xbmc/sources/paplayer/flac-1.2.1/install-sh'
-libdir='${exec_prefix}/lib'
-libexecdir='${exec_prefix}/libexec'
-localedir='${datarootdir}/locale'
-localstatedir='${prefix}/var'
-mandir='${datarootdir}/man'
-oldincludedir='/usr/include'
-pdfdir='${docdir}'
-prefix='/usr/local'
-program_transform_name='s,x,x,'
-psdir='${docdir}'
-sbindir='${exec_prefix}/sbin'
-sharedstatedir='${prefix}/com'
-sysconfdir='${prefix}/etc'
-target_alias=''
-
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-
-#define PACKAGE_NAME ""
-#define PACKAGE_TARNAME ""
-#define PACKAGE_VERSION ""
-#define PACKAGE_STRING ""
-#define PACKAGE_BUGREPORT ""
-#define PACKAGE "flac"
-#define VERSION "1.2.1"
-#define STDC_HEADERS 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_UNISTD_H 1
-#define HAVE_DLFCN_H 1
-#define _FILE_OFFSET_BITS 64
-#define HAVE_FSEEKO 1
-#define SIZEOF_VOIDP 4
-#define HAVE_SOCKLEN_T 1
-#define HAVE_GETOPT_LONG 1
-#define FLAC__CPU_IA32 1
-#define FLAC__ALIGN_MALLOC_DATA 1
-#define FLAC__USE_3DNOW 1
-#define FLAC__USE_ALTIVEC 1
-#define FLAC__HAS_OGG 1
-#define HAVE_ICONV 1
-#define ICONV_CONST 
-#define HAVE_LANGINFO_CODESET 1
-#define FLAC__HAS_GAS 1
-
-configure: exit 0

Deleted: branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/config.status
===================================================================
--- branches/linuxport/sources/paplayer/flac-1.2.1/config.status	2008-07-14 20:32:47 UTC (rev 14088)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/config.status	2008-07-14 22:49:42 UTC (rev 14094)
@@ -1,1225 +0,0 @@
-#! /bin/sh
-# Generated by configure.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=${CONFIG_SHELL-/bin/sh}
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-# Files that config.status was made for.
-config_files=" Makefile src/Makefile src/libFLAC/Makefile src/libFLAC/flac.pc src/libFLAC/ia32/Makefile src/libFLAC/ppc/Makefile src/libFLAC/ppc/as/Makefile src/libFLAC/ppc/gas/Makefile src/libFLAC/include/Makefile src/libFLAC/include/private/Makefile src/libFLAC/include/protected/Makefile src/libFLAC++/Makefile src/libFLAC++/flac++.pc src/flac/Makefile src/metaflac/Makefile src/monkeys_audio_utilities/Makefile src/monkeys_audio_utilities/flac_mac/Makefile src/monkeys_audio_utilities/flac_ren/Makefile src/plugin_common/Makefile src/plugin_winamp2/Makefile src/plugin_winamp2/include/Makefile src/plugin_winamp2/include/winamp2/Makefile src/plugin_xmms/Makefile src/share/Makefile src/share/getopt/Makefile src/share/grabbag/Makefile src/share/replaygain_analysis/Makefile src/share/replaygain_synthesis/Makefile src/share/replaygain_synthesis/include/Makefile src/share/replaygain_synthesis/include/private/Makefile src/share/utf8/Makefile src/test_grabbag/Makefile src/test_grabbag/cuesheet/Makefile src/test_grabbag/picture/Makefile src/test_libs_common/Makefile src/test_libFLAC/Makefile src/test_libFLAC++/Makefile src/test_seeking/Makefile src/test_streams/Makefile examples/Makefile examples/c/Makefile examples/c/decode/Makefile examples/c/decode/file/Makefile examples/c/encode/Makefile examples/c/encode/file/Makefile examples/cpp/Makefile examples/cpp/decode/Makefile examples/cpp/decode/file/Makefile examples/cpp/encode/Makefile examples/cpp/encode/file/Makefile include/Makefile include/FLAC/Makefile include/FLAC++/Makefile include/share/Makefile include/share/grabbag/Makefile include/test_libs_common/Makefile doc/Makefile doc/html/Makefile doc/html/images/Makefile doc/html/images/hw/Makefile doc/html/ru/Makefile m4/Makefile man/Makefile test/Makefile test/cuesheets/Makefile test/flac-to-flac-metadata-test-files/Makefile test/metaflac-test-files/Makefile test/pictures/Makefile build/Makefile obj/Makefile obj/debug/Makefile obj/debug/bin/Makefile obj/debug/lib/Makefile obj/release/Makefile obj/release/bin/Makefile obj/release/lib/Makefile"
-config_headers=" config.h"
-config_commands=" depfiles"
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@...>."
-
-ac_cs_version="\
-config.status
-configured by ./configure, generated by GNU Autoconf 2.61,
-  with options \"\"
-
-Copyright (C) 2006 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='/home/vulkan/xbmc/sources/paplayer/flac-1.2.1'
-srcdir='.'
-INSTALL='/usr/bin/install -c'
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-if $ac_cs_recheck; then
-  echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " $ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=/bin/sh
-  export CONFIG_SHELL
-  exec /bin/sh "./configure" $ac_configure_extra_args --no-create --no-recursion
-fi
-
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  echo "$ac_log"
-} >&5
-
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="" ac_aux_dir="."
-
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "src/libFLAC/Makefile") CONFIG_FILES="$CONFIG_FILES src/libFLAC/Makefile" ;;
-    "src/libFLAC/flac.pc") CONFIG_FILES="$CONFIG_FILES src/libFLAC/flac.pc" ;;
-    "src/libFLAC/ia32/Makefile") CONFIG_FILES="$CONFIG_FILES src/libFLAC/ia32/Makefile" ;;
-    "src/libFLAC/ppc/Makefile") CONFIG_FILES="$CONFIG_FILES src/libFLAC/ppc/Makefile" ;;
-    "src/libFLAC/ppc/as/Makefile") CONFIG_FILES="$CONFIG_FILES src/libFLAC/ppc/as/Makefile" ;;
-    "src/libFLAC/ppc/gas/Makefile") CONFIG_FILES="$CONFIG_FILES src/libFLAC/ppc/gas/Makefile" ;;
-    "src/libFLAC/include/Makefile") CONFIG_FILES="$CONFIG_FILES src/libFLAC/include/Makefile" ;;
-    "src/libFLAC/include/private/Makefile") CONFIG_FILES="$CONFIG_FILES src/libFLAC/include/private/Makefile" ;;
-    "src/libFLAC/include/protected/Makefile") CONFIG_FILES="$CONFIG_FILES src/libFLAC/include/protected/Makefile" ;;
-    "src/libFLAC++/Makefile") CONFIG_FILES="$CONFIG_FILES src/libFLAC++/Makefile" ;;
-    "src/libFLAC++/flac++.pc") CONFIG_FILES="$CONFIG_FILES src/libFLAC++/flac++.pc" ;;
-    "src/flac/Makefile") CONFIG_FILES="$CONFIG_FILES src/flac/Makefile" ;;
-    "src/metaflac/Makefile") CONFIG_FILES="$CONFIG_FILES src/metaflac/Makefile" ;;
-    "src/monkeys_audio_utilities/Makefile") CONFIG_FILES="$CONFIG_FILES src/monkeys_audio_utilities/Makefile" ;;
-    "src/monkeys_audio_utilities/flac_mac/Makefile") CONFIG_FILES="$CONFIG_FILES src/monkeys_audio_utilities/flac_mac/Makefile" ;;
-    "src/monkeys_audio_utilities/flac_ren/Makefile") CONFIG_FILES="$CONFIG_FILES src/monkeys_audio_utilities/flac_ren/Makefile" ;;
-    "src/plugin_common/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugin_common/Makefile" ;;
-    "src/plugin_winamp2/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugin_winamp2/Makefile" ;;
-    "src/plugin_winamp2/include/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugin_winamp2/include/Makefile" ;;
-    "src/plugin_winamp2/include/winamp2/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugin_winamp2/include/winamp2/Makefile" ;;

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14122
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14122&view=rev
Author:   spiff_
Date:     2008-07-15 11:49:47 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
changed: compile ape codec instead of keeping binary in svn (linux x86)

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.in

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Analyze/
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Compress/
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Decompress/
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Shared/
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/

Removed Paths:
-------------
    branches/linuxport/XBMC/system/players/paplayer/MACDll-i486-linux.so
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Analyze/
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Compress/
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Decompress/
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Shared/
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/
    branches/linuxport/sources/paplayer/MACDll/

Modified: branches/linuxport/XBMC/Makefile.in
===================================================================
--- branches/linuxport/XBMC/Makefile.in	2008-07-15 18:47:25 UTC (rev 14121)
+++ branches/linuxport/XBMC/Makefile.in	2008-07-15 18:49:47 UTC (rev 14122)
@@ -1,4 +1,4 @@
-DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec xbmc/cores/paplayer/WavPackCodec xbmc/cores/paplayer/GYMCodec xbmc/cores/paplayer/DCACodec xbmc/cores/paplayer/YMCodec xbmc/cores/paplayer/ModuleCodec xbmc/cores/paplayer/MPCCodec xbmc/cores/paplayer/SPCCodec xbmc/cores/paplayer/MP3Codec xbmc/cores/paplayer/flac-1.2.1/
+DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec xbmc/cores/paplayer/WavPackCodec xbmc/cores/paplayer/GYMCodec xbmc/cores/paplayer/DCACodec xbmc/cores/paplayer/YMCodec xbmc/cores/paplayer/ModuleCodec xbmc/cores/paplayer/MPCCodec xbmc/cores/paplayer/SPCCodec xbmc/cores/paplayer/MP3Codec xbmc/cores/paplayer/flac-1.2.1/ xbmc/cores/paplayer/MACDll
 
 LIBS=@LIBS@
 DEBUG_FLAGS=@DEBUG_FLAGS@
@@ -92,6 +92,7 @@
 	$(MAKE) -C xbmc/cores/paplayer/DCACodec
 	$(MAKE) -C xbmc/cores/paplayer/flac-1.2.1
 	$(MAKE) -C xbmc/cores/paplayer/GYMCodec
+	$(MAKE) -C xbmc/cores/paplayer/MACDll
 	$(MAKE) -C xbmc/cores/paplayer/MIDCodec
 	$(MAKE) -C xbmc/cores/paplayer/ModuleCodec
 	$(MAKE) -C xbmc/cores/paplayer/MPCCodec

Deleted: branches/linuxport/XBMC/system/players/paplayer/MACDll-i486-linux.so
===================================================================
(Binary files differ)

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll (from rev 14107, branches/linuxport/sources/paplayer/MACDll)

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party (from rev 14120, branches/linuxport/sources/paplayer/MACDll/3rd Party)

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Analyze (from rev 14120, branches/linuxport/sources/paplayer/MACDll/Analyze)

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Compress (from rev 14120, branches/linuxport/sources/paplayer/MACDll/Compress)

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Decompress (from rev 14120, branches/linuxport/sources/paplayer/MACDll/Decompress)

Added: branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Makefile	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Makefile	2008-07-15 18:49:47 UTC (rev 14122)
@@ -0,0 +1,49 @@
+OBJS= \
+Source/Console/Console.o		\
+Source/MACLib/APECompress.o		\
+Source/MACLib/APECompressCore.o	\
+Source/MACLib/APECompressCreate.o	\
+Source/MACLib/APEDecompress.o	\
+Source/MACLib/APEInfo.o		\
+Source/MACLib/APELink.o		\
+Source/MACLib/APESimple.o		\
+Source/MACLib/APETag.o		\
+Source/MACLib/BitArray.o		\
+Source/MACLib/MACLib.o		\
+Source/MACLib/MACProgressHelper.o	\
+Source/MACLib/NNFilter.o		\
+Source/MACLib/NewPredictor.o		\
+Source/MACLib/Prepare.o		\
+Source/MACLib/UnBitArray.o		\
+Source/MACLib/UnBitArrayBase.o	\
+Source/MACLib/WAVInputSource.o	\
+Source/MACLib/APEHeader.o \
+Source/Shared/GlobalFunctions.o	\
+Source/Shared/StdLibFileIO.o		\
+Source/Shared/WinFileIO.o		\
+Source/MACLib/MD5.o		\
+Source/Shared/CharacterHelper.o \
+Source/Shared/CircleBuffer.o \
+Source/MACLib/Old/APEDecompressOld.o \
+Source/MACLib/Old/APEDecompressCore.o \
+Source/MACLib/Old/Anti-Predictor.o \
+Source/MACLib/Old/UnMAC.o \
+Source/MACLib/Old/AntiPredictorExtraHigh.o \
+Source/MACLib/Old/AntiPredictorHigh.o \
+Source/MACLib/Old/AntiPredictorFast.o \
+Source/MACLib/Old/UnBitArrayOld.o \
+Source/MACLib/Old/AntiPredictorNormal.o
+
+CFLAGS=-ISource/Shared -ISource/MACLib -ISource/Console -s -O3 -pedantic -D__GNUC_IA32__ -DBUILD_CROSS_PLATFORM
+
+MACDll-i486-linux.so: $(OBJS)
+	gcc -fPIC -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o && cp $@ ../../../../system/players/paplayer
+
+clean:
+	$(RM) $(OBJS) *.so
+
+%o : %c
+	gcc $(CFLAGS) -O2 -fPIC -c $< -o $@
+
+%o : %cpp
+	g++ $(CFLAGS) -O2 -fPIC -c $< -o $@

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Shared (from rev 14120, branches/linuxport/sources/paplayer/MACDll/Shared)

Copied: branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source (from rev 14120, branches/linuxport/sources/paplayer/MACDll/Source)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14129
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14129&view=rev
Author:   spiff_
Date:     2008-07-15 14:09:18 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
changed: compile libxms sources instead of keeping binaries in svn (linux x86)

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.in

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/lib/libXBMS/Makefile
    branches/linuxport/XBMC/xbmc/lib/libXBMS/ccbuffer.c
    branches/linuxport/XBMC/xbmc/lib/libXBMS/ccutil.c
    branches/linuxport/XBMC/xbmc/lib/libXBMS/ccxclient.c
    branches/linuxport/XBMC/xbmc/lib/libXBMS/ccxclientconnxbox.c
    branches/linuxport/XBMC/xbmc/lib/libXBMS/ccxdiscover.c
    branches/linuxport/XBMC/xbmc/lib/libXBMS/ccxencode.c
    branches/linuxport/XBMC/xbmc/lib/libXBMS/ccxmltrans.c
    branches/linuxport/XBMC/xbmc/lib/libXBMS/libXBMS.sln
    branches/linuxport/XBMC/xbmc/lib/libXBMS/libXBMS.vcproj

Removed Paths:
-------------
    branches/linuxport/XBMC/xbmc/lib/libXBMS/libxbms-i486-linux.a
    branches/linuxport/sources/libxbms/Makefile
    branches/linuxport/sources/libxbms/ccbuffer.c
    branches/linuxport/sources/libxbms/ccutil.c
    branches/linuxport/sources/libxbms/ccxclient.c
    branches/linuxport/sources/libxbms/ccxclientconnxbox.c
    branches/linuxport/sources/libxbms/ccxdiscover.c
    branches/linuxport/sources/libxbms/ccxencode.c
    branches/linuxport/sources/libxbms/ccxmltrans.c
    branches/linuxport/sources/libxbms/libXBMS.sln
    branches/linuxport/sources/libxbms/libXBMS.vcproj

Modified: branches/linuxport/XBMC/Makefile.in
===================================================================
--- branches/linuxport/XBMC/Makefile.in	2008-07-15 19:47:35 UTC (rev 14128)
+++ branches/linuxport/XBMC/Makefile.in	2008-07-15 21:09:18 UTC (rev 14129)
@@ -84,6 +84,8 @@
 	$(MAKE) -C tools/EventClients
 librtmp: 
 	$(MAKE) -C xbmc/lib/libRTMP
+libxbms:
+	$(MAKE) -C xbmc/lib/libXBMS
 papcodecs:
 	$(MAKE) -C xbmc/cores/paplayer/AACCodec
 	$(MAKE) -C xbmc/cores/paplayer/AC3Codec
@@ -104,7 +106,7 @@
 	$(MAKE) -C xbmc/cores/paplayer/WavPackCodec
 	$(MAKE) -C xbmc/cores/paplayer/YMCodec
 	
-compile: guilib xbmc filesystem musicdatabase videodatabase cores paplayer dllloader exports xbox linux visualizations screensavers utils common tinyxml sqllite libscrobbler libgoahead unrarxlib libpython dvdplayer libupnp cdrip libcmyth librtmp papcodecs
+compile: guilib xbmc filesystem musicdatabase videodatabase cores paplayer dllloader exports xbox linux visualizations screensavers utils common tinyxml sqllite libscrobbler libgoahead unrarxlib libpython dvdplayer libupnp cdrip libcmyth librtmp libxbms papcodecs
 
 xbmc.bin: $(wildcard xbmc/*.o xbmc/settings/*.o guilib/*.o guilib/tinyXML/*.o guilib/common/*.o xbmc/FileSystem/*.o xbmc/FileSystem/VideoDatabaseDirectory/*.o xbmc/FileSystem/MusicDatabaseDirectory/*.o xbmc/visualizations/*.o xbmc/screensavers/*.o xbmc/cores/*.o xbmc/cores/paplayer/*.o xbmc/linux/*.o xbmc/lib/sqLite/*.o xbmc/lib/libscrobbler/*.o xbmc/lib/libPython/*.o xbmc/lib/libPython/xbmcmodule/*.o xbmc/xbox/*.o xbmc/cores/DllLoader/*.o xbmc/cores/DllLoader/exports/*.o xbmc/cores/DllLoader/exports/util/*.o xbmc/utils/*.o xbmc/lib/UnrarXLib/*.o xbmc/lib/libGoAhead/*.o xbmc/cores/dvdplayer/*.o xbmc/cores/dvdplayer/DVDSubtitles/*.o xbmc/cores/dvdplayer/DVDInputStreams/*.o xbmc/cores/dvdplayer/DVDCodecs/*.o xbmc/cores/dvdplayer/DVDCodecs/Audio/*.o xbmc/cores/dvdplayer/DVDCodecs/Video/*.o xbmc/cores/dvdplayer/DVDCodecs/Overlay/*.o xbmc/cores/dvdplayer/DVDDemuxers/*.o xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc/*.o xbmc/cores/VideoRenderers/*.o xbmc/cores/VideoRenderers/VideoShaders/*.o xbmc/cdrip/*.o xbmc/lib/libcmyth/*.o xbmc/lib/libRTMP/*.o) xbmc/lib/libXBMS/libxbms-@... xbmc/lib/libUPnP/libupnp-@... 
 	g++ $(DEBUG_FLAGS) -o xbmc.bin xbmc/*.o xbmc/settings/*.o xbmc/cdrip/*.o guilib/*.o guilib/tinyXML/*.o guilib/common/*.o xbmc/FileSystem/*.o xbmc/FileSystem/VideoDatabaseDirectory/*.o xbmc/FileSystem/MusicDatabaseDirectory/*.o xbmc/visualizations/*.o xbmc/screensavers/*.o xbmc/cores/*.o xbmc/cores/paplayer/*.o xbmc/linux/*.o xbmc/lib/sqLite/*.o xbmc/lib/libscrobbler/*.o xbmc/lib/libPython/*.o xbmc/lib/libPython/xbmcmodule/*.o xbmc/xbox/*.o xbmc/cores/DllLoader/*.o xbmc/cores/DllLoader/exports/*.o xbmc/cores/DllLoader/exports/util/*.o xbmc/utils/*.o xbmc/lib/UnrarXLib/*.o xbmc/lib/libGoAhead/*.o xbmc/cores/dvdplayer/*.o xbmc/cores/dvdplayer/DVDSubtitles/*.o xbmc/cores/dvdplayer/DVDInputStreams/*.o xbmc/cores/dvdplayer/DVDCodecs/*.o xbmc/cores/dvdplayer/DVDCodecs/Audio/*.o xbmc/cores/dvdplayer/DVDCodecs/Video/*.o xbmc/cores/dvdplayer/DVDCodecs/Overlay/*.o xbmc/cores/dvdplayer/DVDDemuxers/*.o xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc/*.o xbmc/cores/VideoRenderers/*.o xbmc/cores/VideoRenderers/VideoShaders/*.o xbmc/lib/libcmyth/*.o xbmc/lib/libRTMP/*.o xbmc/lib/libGoAhead/libGoAheadD-@... xbmc/lib/libXBMS/libxbms-@... xbmc/lib/libUPnP/libupnp-@... xbmc/lib/libshout/libshout-@... xbmc/lib/libRTV/librtv-@... xbmc/lib/libXDAAP/libxdaap-@... xbmc/lib/libcdio/libcdio-@... xbmc/lib/libsmb/libsmbclient-@... $(LIBS) -rdynamic

Copied: branches/linuxport/XBMC/xbmc/lib/libXBMS/Makefile (from rev 14127, branches/linuxport/sources/libxbms/Makefile)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libXBMS/Makefile	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libXBMS/Makefile	2008-07-15 21:09:18 UTC (rev 14129)
@@ -0,0 +1,22 @@
+AR = ar
+ARFLAGS = rus
+RM = rm -f
+
+CXX=g++
+CC=gcc
+
+DEFINES += -D_LINUX
+
+OBJS := ccbuffer.o ccutil.o ccxclient.o ccxclientconnxbox.o ccxdiscover.o ccxencode.o ccxmltrans.o
+
+.c.o:
+	rm -f ${<:.c=.o}
+	$(CC) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.c=.o}
+
+libxbms.a: $(OBJS)
+	$(AR) $(ARFLAGS) libxbms.a $(OBJS)
+
+all: libxbms.a
+
+clean:
+	$(RM) $(OBJS) libxbms.a

Copied: branches/linuxport/XBMC/xbmc/lib/libXBMS/ccbuffer.c (from rev 14127, branches/linuxport/sources/libxbms/ccbuffer.c)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libXBMS/ccbuffer.c	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libXBMS/ccbuffer.c	2008-07-15 21:09:18 UTC (rev 14129)
@@ -0,0 +1,182 @@
+// Place the code and data below here into the LIBXBMS section.
+#pragma code_seg( "LIBXBMS" )
+#pragma data_seg( "LIBXBMS_RW" )
+#pragma bss_seg( "LIBXBMS_RW" )
+#pragma const_seg( "LIBXBMS_RD" )
+#pragma comment(linker, "/merge:LIBXBMS_RW=LIBXBMS")
+#pragma comment(linker, "/merge:LIBXBMS_RD=LIBXBMS")
+/*   -*- c -*-
+ * 
+ *  ----------------------------------------------------------------------
+ *  Buffer stuff.
+ *  ----------------------------------------------------------------------
+ *
+ *  Copyright (c) 2002-2003 by PuhPuh
+ *  
+ *  This code is copyrighted property of the author.  It can still
+ *  be used for any non-commercial purpose following conditions:
+ *  
+ *      1) This copyright notice is not removed.
+ *      2) Source code follows any distribution of the software
+ *         if possible.
+ *      3) Copyright notice above is found in the documentation
+ *         of the distributed software.
+ *  
+ *  Any express or implied warranties are disclaimed.  Author is
+ *  not liable for any direct or indirect damages caused by the use
+ *  of this software.
+ *
+ *  ----------------------------------------------------------------------
+ *
+ *  This code has been integrated into Xbox Media Player.  
+ *  As such it can me copied, redistributed and modified under
+ *  the same conditions as the XBMP itself.
+ *
+ */
+
+
+#include "ccincludes.h"
+#include "ccbuffer.h"
+
+CcBuffer cc_buffer_allocate(void)
+{
+  CcBuffer buffer;
+
+  buffer = cc_xcalloc(1, sizeof (*buffer));
+  return buffer;
+}
+
+void cc_buffer_free(CcBuffer buffer)
+{
+  cc_buffer_uninit(buffer);
+  cc_xfree(buffer);
+}
+
+void cc_buffer_init(CcBuffer buffer)
+{
+  memset(buffer, 0, sizeof (*buffer));
+}
+
+void cc_buffer_uninit(CcBuffer buffer)
+{
+  if (buffer != NULL)
+    cc_xfree(buffer->data);
+  memset(buffer, 0, sizeof (*buffer));
+}
+
+size_t cc_buffer_len(CcBuffer buffer)
+{
+  return buffer->len;
+}
+
+unsigned char *cc_buffer_ptr(CcBuffer buffer)
+{
+  return buffer->data;
+}
+
+void cc_buffer_append(CcBuffer buffer, const unsigned char *data, size_t len)
+{
+  size_t ol;
+
+  ol = cc_buffer_len(buffer);
+  cc_buffer_append_space(buffer, len);
+  memcpy(buffer->data + ol, data, len);
+}
+
+void cc_buffer_prepend(CcBuffer buffer, const unsigned char *data, size_t len)
+{
+  size_t ol;
+
+  ol = cc_buffer_len(buffer);
+  cc_buffer_append_space(buffer, len);
+  memmove(buffer->data + len, buffer->data, ol);
+  memcpy(buffer->data, data, len);
+}
+
+void cc_buffer_append_space(CcBuffer buffer, size_t len)
+{
+  if (len > 0)
+    {
+      if (buffer->data == NULL)
+	{
+	  buffer->data = cc_xmalloc(len);
+	  buffer->len = 0;
+	}
+      else
+	{
+	  buffer->data = cc_xrealloc(buffer->data, buffer->len + len);
+	}
+      buffer->len += len;
+    }
+}
+
+void cc_buffer_append_string(CcBuffer buffer, const char *string)
+{
+  if (*string != '\0')
+    cc_buffer_append(buffer, (const unsigned char *)string, strlen(string));
+}
+
+void cc_buffer_prepend_string(CcBuffer buffer, const char *string)
+{
+  if (*string != '\0')
+    cc_buffer_prepend(buffer, (const unsigned char *)string, strlen(string));
+}
+
+void cc_buffer_consume(CcBuffer buffer, size_t len)
+{
+  if (len > buffer->len)
+    {
+      cc_fatal("Buffer underflow.");
+    }
+  else if (len == 0)
+    {
+      /*NOTHING*/;
+    }
+  else if (len == buffer->len)
+    {
+      buffer->len = 0;
+    }
+  else
+    {
+      memmove(buffer->data, buffer->data + len, buffer->len - len);
+      buffer->len -= len;
+    }
+}
+
+void cc_buffer_consume_end(CcBuffer buffer, size_t len)
+{
+  if (len > buffer->len)
+    {
+      cc_fatal("Buffer underflow.");
+    }
+  else if (len == 0)
+    {
+      /*NOTHING*/;
+    }
+  else if (len == buffer->len)
+    {
+      buffer->len = 0;
+    }
+  else
+    {
+      buffer->len -= len;
+    }
+}
+
+void cc_buffer_clear(CcBuffer buffer)
+{
+  buffer->len = 0;
+}
+
+void cc_buffer_steal(CcBuffer buffer, unsigned char **data, size_t *len)
+{
+  buffer->data = cc_xrealloc(buffer->data, buffer->len + 1);
+  buffer->data[buffer->len] = '\0';
+  *data = buffer->data;
+  if (len != NULL)
+    *len = buffer->len;
+  buffer->data = NULL;
+  buffer->len = 0;
+}
+
+/* eof (ccbuffer.c) */

Copied: branches/linuxport/XBMC/xbmc/lib/libXBMS/ccutil.c (from rev 14127, branches/linuxport/sources/libxbms/ccutil.c)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libXBMS/ccutil.c	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libXBMS/ccutil.c	2008-07-15 21:09:18 UTC (rev 14129)
@@ -0,0 +1,107 @@
+// Place the code and data below here into the LIBXBMS section.
+#pragma code_seg( "LIBXBMS" )
+#pragma data_seg( "LIBXBMS_RW" )
+#pragma bss_seg( "LIBXBMS_RW" )
+#pragma const_seg( "LIBXBMS_RD" )
+#pragma comment(linker, "/merge:LIBXBMS_RW=LIBXBMS")
+#pragma comment(linker, "/merge:LIBXBMS_RD=LIBXBMS")/*   -*- c -*-
+ * 
+ *  ----------------------------------------------------------------------
+ *  Misc utilities.
+ *  ----------------------------------------------------------------------
+ *
+ *  Copyright (c) 2002-2003 by PuhPuh
+ *  
+ *  This code is copyrighted property of the author.  It can still
+ *  be used for any non-commercial purpose following conditions:
+ *  
+ *      1) This copyright notice is not removed.
+ *      2) Source code follows any distribution of the software
+ *         if possible.
+ *      3) Copyright notice above is found in the documentation
+ *         of the distributed software.
+ *  
+ *  Any express or implied warranties are disclaimed.  Author is
+ *  not liable for any direct or indirect damages caused by the use
+ *  of this software.
+ *
+ *  ----------------------------------------------------------------------
+ *
+ *  This code has been integrated into Xbox Media Player.  
+ *  As such it can me copied, redistributed and modified under
+ *  the same conditions as the XBMP itself.
+ *
+ */
+
+
+#include "ccincludes.h"
+#include "ccutil.h"
+
+void cc_fatal(const char *m)
+{
+#if 0
+  fprintf(stderr, "FATAL ERROR%s%s\n", 
+	  (m != NULL) ? ": " : "",
+	  (m != NULL) ? m :  "");
+#endif
+  exit(-1);
+}
+
+void *cc_xmalloc(size_t n)
+{
+  void *r;
+
+  r = malloc(n);
+  if (r == NULL)
+    cc_fatal("Out of memory");
+  return r;
+}
+
+void *cc_xcalloc(size_t n, size_t s)
+{
+  void *r;
+
+  r = calloc(n, s);
+  if (r == NULL)
+    cc_fatal("Out of memory");
+  return r;
+}
+
+void *cc_xrealloc(void *o, size_t n)
+{
+  void *r;
+
+  r = realloc(o, n);
+  if (r == NULL)
+    cc_fatal("Out of memory");
+  return r;
+}
+
+void *cc_xstrdup(const char *s)
+{
+  char *r;
+
+  r = strdup(s != NULL ? s : "");
+  if (r == NULL)
+    cc_fatal("Out of memory");
+  return r;
+}
+
+void *cc_xmemdup(const void *s, size_t len)
+{
+  unsigned char *r;
+
+  r = cc_xmalloc(len + 1);
+  r[len] = '\0';
+  if (len > 0)
+    memcpy(r, s, len);
+  return (void *)r;
+}
+
+void cc_xfree(void *p)
+{
+  if (p != NULL)
+    free(p);
+}
+
+/* eof (ccutil.c) */

Copied: branches/linuxport/XBMC/xbmc/lib/libXBMS/ccxclient.c (from rev 14127, branches/linuxport/sources/libxbms/ccxclient.c)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libXBMS/ccxclient.c	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libXBMS/ccxclient.c	2008-07-15 21:09:18 UTC (rev 14129)
@@ -0,0 +1,1255 @@
+// Place the code and data below here into the LIBXBMS section.
+#pragma code_seg( "LIBXBMS" )
+#pragma data_seg( "LIBXBMS_RW" )
+#pragma bss_seg( "LIBXBMS_RW" )
+#pragma const_seg( "LIBXBMS_RD" )
+#pragma comment(linker, "/merge:LIBXBMS_RW=LIBXBMS")
+#pragma comment(linker, "/merge:LIBXBMS_RD=LIBXBMS")/*   -*- c -*-
+ * 
+ *  ----------------------------------------------------------------------
+ *  CcXstream Client Library for XBOX Media Player
+ *  ----------------------------------------------------------------------
+ *
+ *  Copyright (c) 2002-2003 by PuhPuh
+ *  
+ *  This code is copyrighted property of the author.  It can still
+ *  be used for any non-commercial purpose following conditions:
+ *  
+ *      1) This copyright notice is not removed.
+ *      2) Source code follows any distribution of the software
+ *         if possible.
+ *      3) Copyright notice above is found in the documentation
+ *         of the distributed software.
+ *  
+ *  Any express or implied warranties are disclaimed.  Author is
+ *  not liable for any direct or indirect damages caused by the use
+ *  of this software.
+ *
+ *  ----------------------------------------------------------------------
+ *
+ *  This code has been integrated into Xbox Media Player.  
+ *  As such it can me copied, redistributed and modified under
+ *  the same conditions as the XBMP itself.
+ *
+ */
+
+#include "ccincludes.h"
+#include "ccbuffer.h"
+#include "ccxclient.h"
+#include "ccxencode.h"
+
+#pragma code_seg()
+#pragma data_seg( )
+#pragma bss_seg( )
+#pragma const_seg(  )
+
+static unsigned long lNextId = 0;
+unsigned long next_id()
+{
+  
+  lNextId = lNextId + 1 % 0xfffff; /* 20 bits in maximum */
+  if (lNextId == 0)
+    lNextId++;
+  return (lNextId << 12); /* Low 12 bits are zero */
+}
+
+#pragma code_seg( "LIBXBMS" )
+#pragma data_seg( "LIBXBMS_RW" )
+#pragma bss_seg( "LIBXBMS_RW" )
+#pragma const_seg( "LIBXBMS_RD" )
+#pragma comment(linker, "/merge:LIBXBMS_RW=LIBXBMS")
+#pragma comment(linker, "/merge:LIBXBMS_RD=LIBXBMS")
+
+CcXstreamClientError cc_xstream_client_version_handshake(CcXstreamServerConnection s)
+{
+  unsigned char *c, x;
+  CcBufferRec buf[1];
+  char *hlp1, *hlp2, *hlp3;
+  int i;
+
+  cc_buffer_init(buf);
+  
+  for (i = 0; 1; i++)
+    {
+      if (i > 2048)
+	{
+	  cc_buffer_uninit(buf);
+	  return CC_XSTREAM_CLIENT_FATAL_ERROR;
+	}
+      c = cc_xstream_client_read_data(s, 1, CCXSTREAM_CLIENT_TIMEOUT_SECONDS * 1000U);
+      if (c == NULL)
+	{
+	  cc_buffer_uninit(buf);
+	  return CC_XSTREAM_CLIENT_FATAL_ERROR;
+	}
+      x = c[0];
+      cc_xfree(c);
+      if (x == '\n')
+	break;
+      else if (x != '\r')
+	cc_buffer_append(buf, &x, 1);
+    }
+  hlp1 = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
+  cc_buffer_uninit(buf);
+  /* OK, we parse the version string.  Supported versions are between
+     the first and the second space characters in the string.
+     Versions are in the comma separated list.  This code is somewhat
+     spaghetti, but it does the trick and ensures that supported
+     versions list contain string CC_XSTREAM_CLIENT_VERSION.  The
+     reason for complexity is that it can be the first or last item in
+     the list.  It can also be the only item in the list.  And of
+     course string we got from the server may be nonstandard and we
+     can't crash because of it. */
+  hlp2 = strchr(hlp1, ' ');
+  if (hlp2 == NULL)
+    {
+      cc_xfree(hlp1);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  hlp2++;
+  hlp3 = strchr(hlp2, ' ');
+  if (hlp3 == NULL)
+    {
+      cc_xfree(hlp1);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  *hlp3 = '\0';
+  while ((hlp3 = strrchr(hlp2, ',')) != NULL)
+    {
+      *hlp3 = '\0';
+      hlp3++;
+      if (strcmp(hlp3, CC_XSTREAM_CLIENT_VERSION) == 0)
+	break;
+    }
+  if (hlp3 == NULL)
+    {
+      if (strcmp(hlp2, CC_XSTREAM_CLIENT_VERSION) != 0)
+	{
+	  cc_xfree(hlp1);
+	  return CC_XSTREAM_CLIENT_FATAL_ERROR;
+	}
+    }
+  cc_xfree(hlp1);
+  if (cc_xstream_client_write_data(s, CC_XSTREAM_CLIENT_VERSION_STR "\n", strlen(CC_XSTREAM_CLIENT_VERSION_STR  "\n"), 0) == 0)
+    return CC_XSTREAM_CLIENT_FATAL_ERROR;
+  return CC_XSTREAM_CLIENT_OK;
+}
+
+unsigned long cc_xstream_client_mkpacket_setcwd(const char *path, 
+						unsigned char **p, size_t *p_len)
+{
+  CcBufferRec buf[1];
+  unsigned int r;
+
+  /* Initialize the buffer. */
+  cc_buffer_init(buf);
+  /* Encode packet */
+  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_SETCWD);
+  r = next_id();
+  cc_xstream_buffer_encode_int(buf, r);
+  cc_xstream_buffer_encode_string(buf, path);
+  cc_xstream_buffer_encode_packet_length(buf);
+  /* Return payload */
+  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
+  *p_len = cc_buffer_len(buf);
+  /* Free the buffer */
+  cc_buffer_uninit(buf);
+  /* Return the command id. */
+  return r;
+}
+
+unsigned long cc_xstream_client_mkpacket_upcwd(unsigned long levels,
+					       unsigned char **p, size_t *p_len)
+{
+  CcBufferRec buf[1];
+  unsigned int r;
+
+  /* Initialize the buffer. */
+  cc_buffer_init(buf);
+  /* Encode packet */
+  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_UPCWD);
+  r = next_id();
+  cc_xstream_buffer_encode_int(buf, r);
+  cc_xstream_buffer_encode_int(buf, levels);
+  cc_xstream_buffer_encode_packet_length(buf);
+  /* Return payload */
+  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
+  *p_len = cc_buffer_len(buf);
+  /* Free the buffer */
+  cc_buffer_uninit(buf);
+  /* Return the command id. */
+  return r;
+}
+
+unsigned long cc_xstream_client_mkpacket_filelist_open(unsigned char **p, size_t *p_len)
+{
+  CcBufferRec buf[1];
+  unsigned int r;
+
+  /* Initialize the buffer. */
+  cc_buffer_init(buf);
+  /* Encode packet */
+  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_FILELIST_OPEN);
+  r = next_id();
+  cc_xstream_buffer_encode_int(buf, r);
+  cc_xstream_buffer_encode_packet_length(buf);
+  /* Return payload */
+  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
+  *p_len = cc_buffer_len(buf);
+  /* Free the buffer */
+  cc_buffer_uninit(buf);
+  /* Return the command id. */
+  return r;
+}
+
+unsigned long cc_xstream_client_mkpacket_filelist_read(unsigned long handle,
+						       unsigned char **p, size_t *p_len)
+{
+  CcBufferRec buf[1];
+  unsigned int r;
+
+  /* Initialize the buffer. */
+  cc_buffer_init(buf);
+  /* Encode packet */
+  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_FILELIST_READ);
+  r = next_id();
+  cc_xstream_buffer_encode_int(buf, r);
+  cc_xstream_buffer_encode_int(buf, handle);
+  cc_xstream_buffer_encode_packet_length(buf);
+  /* Return payload */
+  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
+  *p_len = cc_buffer_len(buf);
+  /* Free the buffer */
+  cc_buffer_uninit(buf);
+  /* Return the command id. */
+  return r;
+}
+
+unsigned long cc_xstream_client_mkpacket_file_info(const char *path,
+						   unsigned char **p, size_t *p_len)
+{
+  CcBufferRec buf[1];
+  unsigned int r;
+
+  /* Initialize the buffer. */
+  cc_buffer_init(buf);
+  /* Encode packet */
+  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_FILE_INFO);
+  r = next_id();
+  cc_xstream_buffer_encode_int(buf, r);
+  cc_xstream_buffer_encode_string(buf, path);
+  cc_xstream_buffer_encode_packet_length(buf);
+  /* Return payload */
+  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
+  *p_len = cc_buffer_len(buf);
+  /* Free the buffer */
+  cc_buffer_uninit(buf);
+  /* Return the command id. */
+  return r;
+}
+
+unsigned long cc_xstream_client_mkpacket_file_open(const char *path,
+						   unsigned char **p, size_t *p_len)
+{
+  CcBufferRec buf[1];
+  unsigned int r;
+
+  /* Initialize the buffer. */
+  cc_buffer_init(buf);
+  /* Encode packet */
+  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_FILE_OPEN);
+  r = next_id();
+  cc_xstream_buffer_encode_int(buf, r);
+  cc_xstream_buffer_encode_string(buf, path);
+  cc_xstream_buffer_encode_packet_length(buf);
+  /* Return payload */
+  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
+  *p_len = cc_buffer_len(buf);
+  /* Free the buffer */
+  cc_buffer_uninit(buf);
+  /* Return the command id. */
+  return r;
+}
+
+unsigned long cc_xstream_client_mkpacket_file_read(unsigned long handle, size_t len,
+						   unsigned char **p, size_t *p_len)
+{
+  CcBufferRec buf[1];
+  unsigned int r;
+
+  /* Initialize the buffer. */
+  cc_buffer_init(buf);
+  /* Encode packet */
+  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_FILE_READ);
+  r = next_id();
+  cc_xstream_buffer_encode_int(buf, r);
+  cc_xstream_buffer_encode_int(buf, handle);
+  cc_xstream_buffer_encode_int(buf, len);
+  cc_xstream_buffer_encode_packet_length(buf);
+  /* Return payload */
+  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
+  *p_len = cc_buffer_len(buf);
+  /* Free the buffer */
+  cc_buffer_uninit(buf);
+  /* Return the command id. */
+  return r;
+}
+
+unsigned long cc_xstream_client_mkpacket_seek(unsigned long handle, 
+					      int seek_type, CC_UINT_64_TYPE_NAME bytes,
+					      unsigned char **p, size_t *p_len)
+{
+  CcBufferRec buf[1];
+  unsigned int r;
+
+  /* Initialize the buffer. */
+  cc_buffer_init(buf);
+  /* Encode packet */
+  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_FILE_SEEK);
+  r = next_id();
+  cc_xstream_buffer_encode_int(buf, r);
+  cc_xstream_buffer_encode_int(buf, handle);
+  cc_xstream_buffer_encode_byte(buf, (unsigned char)seek_type);
+  cc_xstream_buffer_encode_int64(buf, bytes);
+  cc_xstream_buffer_encode_packet_length(buf);
+  /* Return payload */
+  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
+  *p_len = cc_buffer_len(buf);
+  /* Free the buffer */
+  cc_buffer_uninit(buf);
+  /* Return the command id. */
+  return r;
+}
+
+unsigned long cc_xstream_client_mkpacket_close(unsigned long handle,
+					       unsigned char **p, size_t *p_len)
+{
+  CcBufferRec buf[1];
+  unsigned int r;
+
+  /* Initialize the buffer. */
+  cc_buffer_init(buf);
+  /* Encode packet */
+  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_CLOSE);
+  r = next_id();
+  cc_xstream_buffer_encode_int(buf, r);
+  cc_xstream_buffer_encode_int(buf, handle);
+  cc_xstream_buffer_encode_packet_length(buf);
+  /* Return payload */
+  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
+  *p_len = cc_buffer_len(buf);
+  /* Free the buffer */
+  cc_buffer_uninit(buf);
+  /* Return the command id. */
+  return r;
+}
+
+unsigned long cc_xstream_client_mkpacket_close_all(unsigned char **p, size_t *p_len)
+{
+  CcBufferRec buf[1];
+  unsigned int r;
+
+  /* Initialize the buffer. */
+  cc_buffer_init(buf);
+  /* Encode packet */
+  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_CLOSE_ALL);
+  r = next_id();
+  cc_xstream_buffer_encode_int(buf, r);
+  cc_xstream_buffer_encode_packet_length(buf);
+  /* Return payload */
+  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
+  *p_len = cc_buffer_len(buf);
+  /* Free the buffer */
+  cc_buffer_uninit(buf);
+  /* Return the command id. */
+  return r;
+}
+
+unsigned long cc_xstream_client_mkpacket_setconfoption(const char *option, 
+						       const char *value,
+						       unsigned char **p, size_t *p_len)
+{
+  CcBufferRec buf[1];
+  unsigned int r;
+
+  /* Initialize the buffer. */
+  cc_buffer_init(buf);
+  /* Encode packet */
+  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_SET_CONFIGURATION_OPTION);
+  r = next_id();
+  cc_xstream_buffer_encode_int(buf, r);
+  cc_xstream_buffer_encode_string(buf, option);
+  cc_xstream_buffer_encode_string(buf, value);
+  cc_xstream_buffer_encode_packet_length(buf);
+  /* Return payload */
+  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
+  *p_len = cc_buffer_len(buf);
+  /* Free the buffer */
+  cc_buffer_uninit(buf);
+  /* Return the command id. */
+  return r;
+}
+
+unsigned long cc_xstream_client_mkpacket_authentication_init(const char *method,
+	       						     unsigned char **p, size_t *p_len)
+{
+  CcBufferRec buf[1];
+  unsigned int r;
+
+  /* Initialize the buffer. */
+  cc_buffer_init(buf);
+  /* Encode packet */
+  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_AUTHENTICATION_INIT);
+  r = next_id();
+  cc_xstream_buffer_encode_int(buf, r);
+  cc_xstream_buffer_encode_string(buf, method);
+  cc_xstream_buffer_encode_packet_length(buf);
+  /* Return payload */
+  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
+  *p_len = cc_buffer_len(buf);
+  /* Free the buffer */
+  cc_buffer_uninit(buf);
+  /* Return the command id. */
+  return r;
+}
+
+unsigned long cc_xstream_client_mkpacket_authenticate_password(unsigned long handle,
+							       const char *user_id,
+							       const char *password,
+							       unsigned char **p, size_t *p_len)
+{
+  CcBufferRec buf[1];
+  unsigned int r;
+
+  /* Initialize the buffer. */
+  cc_buffer_init(buf);
+  /* Encode packet */
+  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_AUTHENTICATE);
+  r = next_id();
+  cc_xstream_buffer_encode_int(buf, r);
+  cc_xstream_buffer_encode_int(buf, handle);
+  cc_xstream_buffer_encode_string(buf, user_id);
+  cc_xstream_buffer_encode_string(buf, password);
+  cc_xstream_buffer_encode_packet_length(buf);
+  /* Return payload */
+  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
+  *p_len = cc_buffer_len(buf);
+  /* Free the buffer */
+  cc_buffer_uninit(buf);
+  /* Return the command id. */
+  return r;
+}
+
+unsigned long cc_xstream_client_mkpacket_server_discovery(unsigned char **p, size_t *p_len)
+{
+  CcBufferRec buf[1];
+  unsigned int r;
+
+  /* Initialize the buffer. */
+  cc_buffer_init(buf);
+  /* Encode packet. */
+  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_SERVER_DISCOVERY_QUERY);
+  r = next_id();
+  cc_xstream_buffer_encode_int(buf, r);
+  cc_xstream_buffer_encode_string(buf, CC_XSTREAM_CLIENT_VERSION_STR);
+  cc_xstream_buffer_encode_packet_length(buf);
+  /* Return payload */
+  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
+  *p_len = cc_buffer_len(buf);
+  /* Free the buffer */
+  cc_buffer_uninit(buf);
+  /* Return the command id. */
+  return r;
+}
+
+void cc_xstream_client_reply_packet_free(CcXstreamReplyPacket packet)
+{
+  if (packet != NULL)
+    {
+      cc_xfree(packet->string1);
+      cc_xfree(packet->string2);
+    }
+  cc_xfree(packet);
+}
+
+CcXstreamReplyPacket cc_xstream_client_reply_packet_parse(const unsigned char *packet,
+							  size_t packet_len)
+{
+  CcXstreamPacket pt;
+  unsigned long id, handle, err;
+  unsigned char *s1, *s2;
+  size_t sl1, sl2;
+  CcXstreamReplyPacket r;
+
+  if (packet_len < 5)
+    return NULL;
+
+  id = cc_xstream_decode_int(packet + 1);
+
+  switch (packet[0])
+    {
+    case CC_XSTREAM_XBMSP_PACKET_OK:
+      if (packet_len != 5)
+	return NULL;
+      pt = CC_XSTREAM_XBMSP_PACKET_OK;
+      s1 = s2 = NULL;
+      sl1 = sl2 = 0;
+      err = handle = 0;
+      break;
+
+    case CC_XSTREAM_XBMSP_PACKET_ERROR:
+      if (packet_len < 10)
+	return NULL;
+      pt = CC_XSTREAM_XBMSP_PACKET_ERROR;
+      err = packet[5];
+      s1 = s2 = NULL;
+      sl1 = sl2 = 0;
+      handle = 0;
+      break;
+
+    case CC_XSTREAM_XBMSP_PACKET_HANDLE:
+      if (packet_len != 9)
+	return NULL;
+      pt = CC_XSTREAM_XBMSP_PACKET_HANDLE;
+      handle = cc_xstream_decode_int(packet + 5);
+      s1 = s2 = NULL;
+      sl1 = sl2 = 0;
+      err = 0;
+      break;
+
+    case CC_XSTREAM_XBMSP_PACKET_FILE_DATA:
+      pt = CC_XSTREAM_XBMSP_PACKET_FILE_DATA;
+      sl1 = cc_xstream_decode_int(packet + 5);
+      if (packet_len < (sl1 + 13))
+	return NULL;
+      sl2 = cc_xstream_decode_int(packet + 9 + sl1);
+      if (packet_len != (13 + sl1 + sl2))
+	return NULL;
+      s1 = cc_xmemdup(packet + 9, sl1);
+      s2 = cc_xmemdup(packet + 13 + sl1, sl2);
+      err = handle = 0;
+      break;
+
+    case CC_XSTREAM_XBMSP_PACKET_FILE_CONTENTS:
+      if (packet_len < 5)
+	return NULL;
+      pt = CC_XSTREAM_XBMSP_PACKET_FILE_CONTENTS;
+      sl1 = cc_xstream_decode_int(packet + 5);
+      if (packet_len != (sl1 + 9))
+	return NULL;
+      s1 = cc_xmemdup(packet + 9, sl1);
+      s2 = NULL;
+      sl2 = 0;
+      err = handle = 0;
+      break;
+
+    default:
+      return NULL;
+    }
+  r = cc_xcalloc(1, sizeof (*r));
+  r->type = pt;
+  r->id = id;
+  r->handle = handle;
+  r->error = err;
+  r->string1 = s1;
+  r->string2 = s2;
+  r->string1_len = sl1;
+  r->string2_len = sl2;
+  return r;
+}
+
+CcXstreamClientError cc_xstream_client_reply_packet_read(CcXstreamServerConnection s,
+							 CcXstreamReplyPacket *packet)
+{
+  unsigned char *lb, *pb;
+  size_t len;
+  CcXstreamReplyPacket p;
+
+  if ((lb = cc_xstream_client_read_data(s, 4, CCXSTREAM_CLIENT_TIMEOUT_SECONDS * 1000U)) == NULL)
+    return CC_XSTREAM_CLIENT_FATAL_ERROR;
+  len = cc_xstream_decode_int(lb);
+  cc_xfree(lb);
+  if (len > 0x20000)
+    {
+      fprintf(stderr, "Too long packet (len=%u)\n", (unsigned int)len);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  if ((pb = cc_xstream_client_read_data(s, len, CCXSTREAM_CLIENT_TIMEOUT_SECONDS * 1000U)) == NULL)
+    {
+      free(pb);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  p = cc_xstream_client_reply_packet_parse(pb, len);
+  cc_xfree(pb);
+  if (p == NULL)
+    return CC_XSTREAM_CLIENT_FATAL_ERROR;
+  *packet = p;
+  return CC_XSTREAM_CLIENT_OK;
+}
+
+CcXstreamClientError cc_xstream_client_setcwd(CcXstreamServerConnection s,
+					      const char *path)
+{
+  unsigned char *pb;
+  size_t pb_len;
+  unsigned long id;
+  CcXstreamReplyPacket rp;
+
+  id = cc_xstream_client_mkpacket_setcwd(path, &pb, &pb_len);
+  if (cc_xstream_client_write_data(s, pb, pb_len, 0) == 0)
+    {
+      cc_xfree(pb);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  cc_xfree(pb);
+  if (cc_xstream_client_reply_packet_read(s, &rp) != CC_XSTREAM_CLIENT_OK)
+    return CC_XSTREAM_CLIENT_FATAL_ERROR;
+  if (rp->id != id)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_OK)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_OK;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_ERROR)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_COMMAND_FAILED;
+    }
+  else
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  /*NOTREACHED*/
+}
+
+CcXstreamClientError cc_xstream_client_upcwd(CcXstreamServerConnection s,
+					     unsigned long levels)
+{
+  unsigned char *pb;
+  size_t pb_len;
+  unsigned long id;
+  CcXstreamReplyPacket rp;
+
+  id = cc_xstream_client_mkpacket_upcwd(levels, &pb, &pb_len);
+  if (cc_xstream_client_write_data(s, pb, pb_len, 0) == 0)
+    {
+      cc_xfree(pb);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  cc_xfree(pb);
+  if (cc_xstream_client_reply_packet_read(s, &rp) != CC_XSTREAM_CLIENT_OK)
+    return CC_XSTREAM_CLIENT_FATAL_ERROR;
+  if (rp->id != id)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_OK)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_OK;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_ERROR)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_COMMAND_FAILED;
+    }
+  else
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  /*NOTREACHED*/
+}
+
+
+CcXstreamClientError cc_xstream_client_close(CcXstreamServerConnection s,
+					     unsigned long handle)
+{
+  unsigned char *pb;
+  size_t pb_len;
+  unsigned long id;
+  CcXstreamReplyPacket rp;
+
+  id = cc_xstream_client_mkpacket_close(handle, &pb, &pb_len);
+  if (cc_xstream_client_write_data(s, pb, pb_len, 0) == 0)
+    {
+      cc_xfree(pb);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  cc_xfree(pb);
+  if (cc_xstream_client_reply_packet_read(s, &rp) != CC_XSTREAM_CLIENT_OK)
+    return CC_XSTREAM_CLIENT_FATAL_ERROR;
+  if (rp->id != id)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_OK)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_OK;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_ERROR)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_COMMAND_FAILED;
+    }
+  else
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  /*NOTREACHED*/
+}
+
+CcXstreamClientError cc_xstream_client_close_all(CcXstreamServerConnection s)
+{
+  unsigned char *pb;
+  size_t pb_len;
+  unsigned long id;
+  CcXstreamReplyPacket rp;
+
+  id = cc_xstream_client_mkpacket_close_all(&pb, &pb_len);
+  if (cc_xstream_client_write_data(s, pb, pb_len, 0) == 0)
+    {
+      cc_xfree(pb);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  cc_xfree(pb);
+  if (cc_xstream_client_reply_packet_read(s, &rp) != CC_XSTREAM_CLIENT_OK)
+    return CC_XSTREAM_CLIENT_FATAL_ERROR;
+  if (rp->id != id)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_OK)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_OK;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_ERROR)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_COMMAND_FAILED;
+    }
+  else
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  /*NOTREACHED*/
+}
+
+CcXstreamClientError cc_xstream_client_file_open(CcXstreamServerConnection s,
+						 const char *path,
+						 unsigned long *handle)
+{
+  unsigned char *pb;
+  size_t pb_len;
+  unsigned long id;
+  CcXstreamReplyPacket rp;
+
+  id = cc_xstream_client_mkpacket_file_open(path, &pb, &pb_len);
+  if (cc_xstream_client_write_data(s, pb, pb_len, 0) == 0)
+    {
+      cc_xfree(pb);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  cc_xfree(pb);
+  if (cc_xstream_client_reply_packet_read(s, &rp) != CC_XSTREAM_CLIENT_OK)
+    return CC_XSTREAM_CLIENT_FATAL_ERROR;
+  if (rp->id != id)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_HANDLE)
+    {
+      *handle = rp->handle;
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_OK;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_ERROR)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_COMMAND_FAILED;
+    }
+  else
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  /*NOTREACHED*/
+}
+
+CcXstreamClientError cc_xstream_client_file_read(CcXstreamServerConnection s,
+						 unsigned long handle,
+						 size_t len,
+						 unsigned char **data,
+						 size_t *data_len)
+{
+  unsigned char *pb;
+  size_t pb_len;
+  unsigned long id;
+  CcXstreamReplyPacket rp;
+
+  id = cc_xstream_client_mkpacket_file_read(handle, len, &pb, &pb_len);
+  if (cc_xstream_client_write_data(s, pb, pb_len, 0) == 0)
+    {
+      cc_xfree(pb);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  cc_xfree(pb);
+  if (cc_xstream_client_reply_packet_read(s, &rp) != CC_XSTREAM_CLIENT_OK)
+    {
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  if (rp->id != id)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_FILE_CONTENTS)
+    {
+      *data = rp->string1;
+      *data_len = rp->string1_len;
+      rp->string1 = NULL;
+      rp->string1_len = 0;
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_OK;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_ERROR)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_COMMAND_FAILED;
+    }
+  else
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  /*NOTREACHED*/
+}
+
+CcXstreamClientError cc_xstream_client_dir_open(CcXstreamServerConnection s,
+						unsigned long *handle)
+{
+  unsigned char *pb;
+  size_t pb_len;
+  unsigned long id;
+  CcXstreamReplyPacket rp;
+
+  id = cc_xstream_client_mkpacket_filelist_open(&pb, &pb_len);
+  if (cc_xstream_client_write_data(s, pb, pb_len, 0) == 0)
+    {
+      cc_xfree(pb);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  cc_xfree(pb);
+  if (cc_xstream_client_reply_packet_read(s, &rp) != CC_XSTREAM_CLIENT_OK)
+    return CC_XSTREAM_CLIENT_FATAL_ERROR;
+  if (rp->id != id)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_HANDLE)
+    {
+      *handle = rp->handle;
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_OK;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_ERROR)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_COMMAND_FAILED;
+    }
+  else
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  /*NOTREACHED*/
+}
+
+CcXstreamClientError cc_xstream_client_dir_read(CcXstreamServerConnection s,
+						unsigned long handle,
+						char **name,
+						char **info)
+{
+  unsigned char *pb;
+  size_t pb_len;
+  unsigned long id;
+  CcXstreamReplyPacket rp;
+
+  id = cc_xstream_client_mkpacket_filelist_read(handle, &pb, &pb_len);
+  if (cc_xstream_client_write_data(s, pb, pb_len, 0) == 0)
+    {
+      cc_xfree(pb);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  cc_xfree(pb);
+  if (cc_xstream_client_reply_packet_read(s, &rp) != CC_XSTREAM_CLIENT_OK)
+    return CC_XSTREAM_CLIENT_FATAL_ERROR;
+  if (rp->id != id)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_FILE_DATA)
+    {
+      *name = rp->string1;
+      *info = rp->string2;
+      rp->string1 = NULL;
+      rp->string1_len = 0;
+      rp->string2 = NULL;
+      rp->string2_len = 0;
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_OK;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_ERROR)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_COMMAND_FAILED;
+    }
+  else
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  /*NOTREACHED*/
+}
+
+CcXstreamClientError cc_xstream_client_file_forward(CcXstreamServerConnection s,
+					            unsigned long handle,
+					            CC_UINT_64_TYPE_NAME bytes,
+					            int seek_eof_if_fails)
+{
+  unsigned char *pb;
+  size_t pb_len;
+  unsigned long id;
+  CcXstreamReplyPacket rp;
+
+  id = cc_xstream_client_mkpacket_seek(handle, 2, bytes, &pb, &pb_len);
+  if (cc_xstream_client_write_data(s, pb, pb_len, 0) == 0)
+    {
+      cc_xfree(pb);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  cc_xfree(pb);
+  if (cc_xstream_client_reply_packet_read(s, &rp) != CC_XSTREAM_CLIENT_OK)
+    return CC_XSTREAM_CLIENT_FATAL_ERROR;
+  if (rp->id != id)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_OK)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_OK;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_ERROR)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      if (seek_eof_if_fails)
+	return cc_xstream_client_file_end(s, handle);
+      else
+	return CC_XSTREAM_CLIENT_COMMAND_FAILED;
+    }
+  else
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  /*NOTREACHED*/
+}
+
+CcXstreamClientError cc_xstream_client_file_backwards(CcXstreamServerConnection s,
+					       	      unsigned long handle,
+					              CC_UINT_64_TYPE_NAME bytes,
+					              int rewind_if_fails)
+{
+  unsigned char *pb;
+  size_t pb_len;
+  unsigned long id;
+  CcXstreamReplyPacket rp;
+
+  id = cc_xstream_client_mkpacket_seek(handle, 3, bytes, &pb, &pb_len);
+  if (cc_xstream_client_write_data(s, pb, pb_len, 0) == 0)
+    {
+      cc_xfree(pb);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  cc_xfree(pb);
+  if (cc_xstream_client_reply_packet_read(s, &rp) != CC_XSTREAM_CLIENT_OK)
+    return CC_XSTREAM_CLIENT_FATAL_ERROR;
+  if (rp->id != id)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_OK)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_OK;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_ERROR)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      if (rewind_if_fails)
+	return cc_xstream_client_file_rewind(s, handle);
+      else
+	return CC_XSTREAM_CLIENT_COMMAND_FAILED;
+    }
+  else
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  /*NOTREACHED*/
+}
+
+CcXstreamClientError cc_xstream_client_file_rewind(CcXstreamServerConnection s,
+					       	   unsigned long handle)
+{
+  unsigned char *pb;
+  size_t pb_len;
+  unsigned long id;
+  CcXstreamReplyPacket rp;
+
+  id = cc_xstream_client_mkpacket_seek(handle, 0, 0, &pb, &pb_len);
+  if (cc_xstream_client_write_data(s, pb, pb_len, 0) == 0)
+    {
+      cc_xfree(pb);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  cc_xfree(pb);
+  if (cc_xstream_client_reply_packet_read(s, &rp) != CC_XSTREAM_CLIENT_OK)
+    return CC_XSTREAM_CLIENT_FATAL_ERROR;
+  if (rp->id != id)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_OK)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_OK;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_ERROR)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_COMMAND_FAILED;
+    }
+  else
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  /*NOTREACHED*/
+}
+
+CcXstreamClientError cc_xstream_client_file_end(CcXstreamServerConnection s,
+					       	   unsigned long handle)
+{
+  unsigned char *pb;
+  size_t pb_len;
+  unsigned long id;
+  CcXstreamReplyPacket rp;
+
+  id = cc_xstream_client_mkpacket_seek(handle, 1, 0, &pb, &pb_len);
+  if (cc_xstream_client_write_data(s, pb, pb_len, 0) == 0)
+    {
+      cc_xfree(pb);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  cc_xfree(pb);
+  if (cc_xstream_client_reply_packet_read(s, &rp) != CC_XSTREAM_CLIENT_OK)
+    return CC_XSTREAM_CLIENT_FATAL_ERROR;
+  if (rp->id != id)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_OK)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_OK;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_ERROR)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_COMMAND_FAILED;
+    }
+  else
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  /*NOTREACHED*/
+}
+
+CcXstreamClientError cc_xstream_client_file_info(CcXstreamServerConnection s,
+						 const char *path,
+       						 char **info)
+{
+  unsigned char *pb;
+  size_t pb_len;
+  unsigned long id;
+  CcXstreamReplyPacket rp;
+
+  id = cc_xstream_client_mkpacket_file_info(path, &pb, &pb_len);
+  if (cc_xstream_client_write_data(s, pb, pb_len, 0) == 0)
+    {
+      cc_xfree(pb);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  cc_xfree(pb);
+  if (cc_xstream_client_reply_packet_read(s, &rp) != CC_XSTREAM_CLIENT_OK)
+    return CC_XSTREAM_CLIENT_FATAL_ERROR;
+  if (rp->id != id)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_FILE_DATA)
+    {
+      *info = rp->string2;
+      rp->string2 = NULL;
+      rp->string2_len = 0;
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_OK;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_ERROR)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_COMMAND_FAILED;
+    }
+  else
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  /*NOTREACHED*/
+}
+
+CcXstreamClientError cc_xstream_client_set_configuration_option(CcXstreamServerConnection s,
+								const char *option,
+								const char *value)
+{
+  unsigned char *pb;
+  size_t pb_len;
+  unsigned long id;
+  CcXstreamReplyPacket rp;
+
+  id = cc_xstream_client_mkpacket_setconfoption(option, value, &pb, &pb_len);
+  if (cc_xstream_client_write_data(s, pb, pb_len, 0) == 0)
+    {
+      cc_xfree(pb);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  cc_xfree(pb);
+  if (cc_xstream_client_reply_packet_read(s, &rp) != CC_XSTREAM_CLIENT_OK)
+    return CC_XSTREAM_CLIENT_FATAL_ERROR;
+  if (rp->id != id)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_OK)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_OK;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_ERROR)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_COMMAND_FAILED;
+    }
+  else
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  /*NOTREACHED*/
+}
+
+CcXstreamClientError cc_xstream_client_password_authenticate(CcXstreamServerConnection s,
+							     const char *user_id,
+							     const char *password)
+{
+  unsigned char *pb;
+  size_t pb_len;
+  unsigned long id;
+  CcXstreamReplyPacket rp;
+  unsigned int handle;
+
+  id = cc_xstream_client_mkpacket_authentication_init("password", &pb, &pb_len);
+  if (cc_xstream_client_write_data(s, pb, pb_len, 0) == 0)
+    {
+      cc_xfree(pb);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  cc_xfree(pb);
+  if (cc_xstream_client_reply_packet_read(s, &rp) != CC_XSTREAM_CLIENT_OK)
+    {
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  if (rp->id != id)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_HANDLE)
+    {
+      handle = rp->handle;
+      cc_xstream_client_reply_packet_free(rp);
+    }
+  else
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  id = cc_xstream_client_mkpacket_authenticate_password(handle, user_id, password, &pb, &pb_len);
+  if (cc_xstream_client_write_data(s, pb, pb_len, 0) == 0)
+    {
+      cc_xfree(pb);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  cc_xfree(pb);
+  if (cc_xstream_client_reply_packet_read(s, &rp) != CC_XSTREAM_CLIENT_OK)
+    {
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  if (rp->id != id)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_OK)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_OK;
+    }
+  else if (rp->type == CC_XSTREAM_XBMSP_PACKET_ERROR)
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_COMMAND_FAILED;
+    }
+  else
+    {
+      cc_xstream_client_reply_packet_free(rp);
+      return CC_XSTREAM_CLIENT_FATAL_ERROR;
+    }
+  /*NOTREACHED*/
+}
+
+/* eof (ccxclient.c) */

Copied: branches/linuxport/XBMC/xbmc/lib/libXBMS/ccxclientconnxbox.c (from rev 14127, branches/linuxport/sources/libxbms/ccxclientconnxbox.c)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libXBMS/ccxclientconnxbox.c	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libXBMS/ccxclientconnxbox.c	2008-07-15 21:09:18 UTC (rev 14129)
@@ -0,0 +1,194 @@
+// Place the code and data below here into the LIBXBMS section.
+#pragma code_seg( "LIBXBMS" )
+#pragma data_seg( "LIBXBMS_RW" )
+#pragma bss_seg( "LIBXBMS_RW" )
+#pragma const_seg( "LIBXBMS_RD" )
+#pragma comment(linker, "/merge:LIBXBMS_RW=LIBXBMS")
+#pragma comment(linker, "/merge:LIBXBMS_RD=LIBXBMS")/*   -*- c -*-
+ * 
+ *  ----------------------------------------------------------------------
+ *  CcXstream Client Library for XBOX Media Player
+ *  ----------------------------------------------------------------------
+ *
+ *  Copyright (c) 2002-2003 by PuhPuh
+ *  
+ *  This code is copyrighted property of the author.  It can still
+ *  be used for any non-commercial purpose following conditions:
+ *  
+ *      1) This copyright notice is not removed.
+ *      2) Source code follows any distribution of the software
+ *         if possible.
+ *      3) Copyright notice above is found in the documentation
+ *         of the distributed software.
+ *  
+ *  Any express or implied warranties are disclaimed.  Author is
+ *  not liable for any direct or indirect damages caused by the use
+ *  of this software.
+ *
+ *  ----------------------------------------------------------------------
+ *
+ *  This code has been integrated into Xbox Media Player.  
+ *  As such it can me copied, redistributed and modified under
+ *  the same conditions as the XBMP itself.
+ *
+ */
+
+#include "ccincludes.h"
+#include "ccbuffer.h"
+#include "ccxclient.h"
+
+#ifndef _XBOX
+#define CC_XSTREAM_SOCKET_FD_TYPE          int
+#define CC_XSTREAM_SOCKET_CLOSE            close
+#define CC_XSTREAM_SOCKET_WRITE(s, b, l)   write((s), (b), (l))
+#define CC_XSTREAM_SOCKET_READ(s, b, l)    read((s), (b), (l))
+#else /* ! _XBOX */
+#define CC_XSTREAM_SOCKET_FD_TYPE          SOCKET
+#define CC_XSTREAM_SOCKET_CLOSE            closesocket
+#define CC_XSTREAM_SOCKET_WRITE(s, b, l)   send((s), (b), (l), 0)
+#define CC_XSTREAM_SOCKET_READ(s, b, l)    recv((s), (b), (l), 0)
+#endif /* ! _XBOX */
+
+static void cc_xstream_client_socket_setup(CC_XSTREAM_SOCKET_FD_TYPE sock)
+{
+  int i;
+
+#ifdef TCP_NODELAY
+  i = 1;
+  setsockopt(sock, IPPROTO_TCP,TCP_NODELAY, (char *)(&i), sizeof (i));
+#endif /* TCP_NODELAY */
+}
+
+CcXstreamClientError cc_xstream_client_connect(const char *host,
+					       int port,
+					       CcXstreamServerConnection *s)
+{
+  CC_XSTREAM_SOCKET_FD_TYPE sock;
+  struct sockaddr_in sa;
+#ifndef _XBOX
+  struct hostent *he;
+#endif /* ! _XBOX */
+
+  memset(&sa, 0, sizeof (sa));
+  sa.sin_port = htons(port);
+  sa.sin_family = AF_INET;
+  if (inet_addr(host) == INADDR_NONE)
+    {
+#ifndef _XBOX
+      he = gethostbyname(host);
+      if ((he == NULL) || (he->h_addrtype != AF_INET) || (he->h_length != 4))
+	return CC_XSTREAM_CLIENT_SERVER_NOT_FOUND;
+      memcpy(&(sa.sin_addr), he->h_addr, 4);
+#else  /* ! _XBOX */
+      return CC_XSTREAM_CLIENT_SERVER_NOT_FOUND;
+#endif  /* ! _XBOX */
+    }
+  else
+    {
+      sa.sin_addr.s_addr = inet_addr(host);
+    }
+  sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+  if (sock < 0)
+    return CC_XSTREAM_CLIENT_FATAL_ERROR;
+  if (connect(sock, (struct sockaddr *)&sa, sizeof (sa)) != 0)
+    {
+      CC_XSTREAM_SOCKET_CLOSE(sock);
+      return CC_XSTREAM_CLIENT_SERVER_CONNECTION_FAILED;
+    }
+  cc_xstream_client_socket_setup(sock);
+  *s = (CcXstreamServerConnection)sock;
+  return CC_XSTREAM_CLIENT_OK;
+}
+
+CcXstreamClientError cc_xstream_client_disconnect(CcXstreamServerConnection s)
+{
+  CC_XSTREAM_SOCKET_FD_TYPE sock;
+
+  sock = (CC_XSTREAM_SOCKET_FD_TYPE)s;
+  CC_XSTREAM_SOCKET_CLOSE(s);
+  return CC_XSTREAM_CLIENT_OK;
+}
+
+unsigned char *cc_xstream_client_read_data(CcXstreamServerConnection s, 
+					   size_t len, 
+					   unsigned long timeout_ms)
+{
+  unsigned char *buf;
+  size_t done;
+  CC_XSTREAM_SOCKET_FD_TYPE sock;
+  int rv;
+  struct timeval tv;
+  fd_set fds;
+
+  /* Convert the conenction handle to simple file descriptor. */
+  sock = (CC_XSTREAM_SOCKET_FD_TYPE)s;
+
+  /* We terminate incoming buffer just to make code safer. 
+     Caller should not count on it anyway. */
+  buf = cc_xmalloc(len + 1);
+  buf[len] = '\0'; 
+
+  for (done = 0; done < len; /*NOTHING*/)
+    {
+      if (timeout_ms > 0)
+	{
+	  tv.tv_sec = timeout_ms / 1000U;
+	  tv.tv_usec = (timeout_ms % 1000U) * 1000U;
+	  FD_ZERO(&fds);
+	  FD_SET(sock, &fds);
+	  if (select(sock + 1, &fds, NULL, NULL, &tv) != 1)
+	    {
+	      /* Timeout or error, we don't really care. */
+	      cc_xfree(buf);
+	      return NULL;
+	    }
+	}
+      rv = CC_XSTREAM_SOCKET_READ(sock, buf + done, len - done);
+      if (rv < 1)
+	{
+	  cc_xfree(buf);
+	  return NULL;
+	}
+      done += rv;
+    }
+  return buf;
+}
+
+int cc_xstream_client_write_data(CcXstreamServerConnection s,
+				 unsigned char *buf,
+				 size_t len,
+				 unsigned long timeout_ms)
+{
+  size_t done;
+  CC_XSTREAM_SOCKET_FD_TYPE sock;
+  int rv;
+  struct timeval tv;
+  fd_set fds;
+
+  /* Convert the conenction handle to simple file descriptor. */
+  sock = (CC_XSTREAM_SOCKET_FD_TYPE)s;
+
+  for (done = 0; done < len; /*NOTHING*/)
+    {
+      if (timeout_ms > 0)
+	{
+	  tv.tv_sec = timeout_ms / 1000U;
+	  tv.tv_usec = (timeout_ms % 1000U) * 1000U;
+	  FD_ZERO(&fds);
+	  FD_SET(sock, &fds);
+	  if (select(sock + 1, NULL, &fds, NULL, &tv) != 1)
+	    {
+	      /* Timeout or error, we don't really care. */
+	      cc_xfree(buf);
+	      return 0;
+	    }
+	}
+      rv = CC_XSTREAM_SOCKET_WRITE(sock, buf + done, len - done);
+      if (rv < 1)
+	return 0;
+      done += rv;
+    }
+  return 1;
+}
+
+/* eof (ccxclientconn.c) */

Copied: branches/linuxport/XBMC/xbmc/lib/libXBMS/ccxdiscover.c (from rev 14127, branches/linuxport/sources/libxbms/ccxdiscover.c)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libXBMS/ccxdiscover.c	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libXBMS/ccxdiscover.c	2008-07-15 21:09:18 UTC (rev 14129)
@@ -0,0 +1,225 @@
+// Place the code and data below here into the LIBXBMS section.
+#pragma code_seg( "LIBXBMS" )
+#pragma data_seg( "LIBXBMS_RW" )
+#pragma bss_seg( "LIBXBMS_RW" )
+#pragma const_seg( "LIBXBMS_RD" )
+#pragma comment(linker, "/merge:LIBXBMS_RW=LIBXBMS")
+#pragma comment(linker, "/merge:LIBXBMS_RD=LIBXBMS")/*   -*- c -*-
+ * 
+ *  ----------------------------------------------------------------------
+ *  CcXstream Client Library for XBOX Media Player (Server Discovery)
+ *  ----------------------------------------------------------------------
+ *
+ *  Copyright (c) 2002-2003 by PuhPuh
+ *  
+ *  This code is copyrighted property of the author.  It can still
+ *  be used for any non-commercial purpose following conditions:
+ *  
+ *      1) This copyright notice is not removed.
+ *      2) Source code follows any distribution of the software
+ *         if possible.
+ *      3) Copyright notice above is found in the documentation
+ *         of the distributed software.
+ *  
+ *  Any express or implied warranties are disclaimed.  Author is
+ *  not liable for any direct or indirect damages caused by the use
+ *  of this software.
+ *
+ *  ----------------------------------------------------------------------
+ *
+ *  This code has been integrated into Xbox Media Player.  
+ *  As such it can me copied, redistributed and modified under
+ *  the same conditions as the XBMP itself.
+ *
+ */
+ 
+#include "ccincludes.h"
+#include "ccbuffer.h"
+#include "ccxclient.h"
+#include "ccxencode.h"
+
+static unsigned long timeout_start()
+{
+#if defined (__linux__) || defined(__APPLE__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__CYGWIN__) || defined (sun)
+  struct timeval tv;
+  unsigned long r;
+
+  gettimeofday(&tv, NULL);
+  r = (((unsigned long)tv.tv_sec) % 200000000U) * 10U;
+  r += ((unsigned long)tv.tv_usec) / 100000U;
+  return r;
+#elif defined (_XBOX)
+  return ((unsigned long)(GetTickCount()) / 100U);
+#else
+  time_t t;
+
+  t = time(NULL);
+  return (((unsigned long)t) % 200000000U) * 10U;
+#endif
+}
+
+static int timeout_exceeded(unsigned long start_time)
+{
+  unsigned long t;
+
+  t = timeout_start();
+  return ((t < start_time) || ((start_time + 9) < t));
+}
+
+CcXstreamClientError ccx_client_discover_servers(CcXstreamServerDiscoveryCB callback, void *context)
+{
+  struct sockaddr_in sa, ra;
+#if defined (_XBOX) || defined (WIN32)
+  size_t sa_len, ra_len;
+#else
+  socklen_t sa_len, ra_len;
+#endif
+  unsigned long handle, p_len, p_handle;
+  unsigned char *packet, ch;
+  size_t packet_len;
+  int found = 0, l, c;
+#if defined (_XBOX) || defined (WIN32)
+  SOCKET sock;
+#else
+  int sock;
+#endif
+  unsigned long t0;
+  fd_set rs;
+  struct timeval tv;
+  CcBufferRec buf[1], seen_buf[1];
+  char *p_address, *p_port, *p_version, *p_comment;
+
+  memset(&sa, 0, sizeof (sa));
+  sa.sin_family = AF_INET;
+  sa.sin_addr.s_addr = htonl(INADDR_BROADCAST);
+  sa.sin_port = htons(CC_XSTREAM_DEFAULT_PORT);
+  sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+  if (sock < 0)
+    return CC_XSTREAM_CLIENT_COMMAND_FAILED;
+  c = 1;
+  setsockopt(sock, SOL_SOCKET, SO_BROADCAST, (char *)(&c), sizeof (c));
+  handle = cc_xstream_client_mkpacket_server_discovery(&packet, &packet_len);
+  sa_len = sizeof (sa);
+  sendto(sock,  packet, packet_len, 0, (struct sockaddr *)(&sa), sa_len);
+  t0 = timeout_start();
+  cc_buffer_init(seen_buf);
+  while (1)
+    {
+      if (timeout_exceeded(t0))
+	{
+	  cc_buffer_uninit(seen_buf);
+	  break;
+	}
+      FD_ZERO(&rs);
+      FD_SET(sock, &rs);
+      tv.tv_sec = 0;
+      tv.tv_usec = 350000;
+      switch (select(sock + 1, &rs, NULL, NULL, &tv))
+	{
+	case -1:
+#if defined (_XBOX) || defined (WIN32)
+	  closesocket(sock);
+#else
+	  close(sock);
+#endif
+	  cc_buffer_uninit(seen_buf);
+	  cc_xfree(packet);
+	  return (found > 0) ? CC_XSTREAM_CLIENT_OK : CC_XSTREAM_CLIENT_COMMAND_FAILED;
+	  /*NOTREACHED*/
+	  
+	case 0:
+	  /* Resend packet if we got timeout. */
+	  sendto(sock,  packet, packet_len, 0, (struct sockaddr *)(&sa), sa_len);
+	  break;
+
+	default:
+	  memset(&ra, 0, sizeof (ra));
+	  cc_buffer_init(buf);
+	  cc_buffer_append_space(buf, 2000);
+	  ra_len = sizeof (ra);
+	  l = recvfrom(sock, cc_buffer_ptr(buf), cc_buffer_len(buf), 0, (struct sockaddr *)(&ra), &ra_len);
+	  if (l > 0)
+	    {
+	      cc_buffer_consume_end(buf, cc_buffer_len(buf) - l);
+	      if (cc_xstream_buffer_decode_int(buf, &p_len) &&
+		  (p_len == cc_buffer_len(buf)) &&
+		  cc_xstream_buffer_decode_byte(buf, &ch) &&
+		  ((CcXstreamPacket)ch == CC_XSTREAM_XBMSP_PACKET_SERVER_DISCOVERY_REPLY) &&
+		  cc_xstream_buffer_decode_int(buf, &p_handle) &&
+		  (p_handle == handle) &&
+		  cc_xstream_buffer_decode_string(buf, (unsigned char **)(&p_address), NULL) &&
+		  cc_xstream_buffer_decode_string(buf, (unsigned char **)(&p_port), NULL) &&
+		  cc_xstream_buffer_decode_string(buf, (unsigned char **)(&p_version), NULL) &&
+		  cc_xstream_buffer_decode_string(buf, (unsigned char **)(&p_comment), NULL) &&
+		  (cc_buffer_len(buf) == 0))
+		{
+		  if (strlen(p_address) == 0)
+		    {
+		      cc_xfree(p_address);
+#ifdef _XBOX
+		      {
+			unsigned char *b;
+
+			b = (unsigned char *)(&(ra.sin_addr.s_addr));
+			p_address = cc_xmalloc(32);
+			sprintf(p_address, "%d.%d.%d.%d", (int)(b[0]), (int)(b[1]), (int)(b[2]), (int)(b[3]));
+		      }
+#else
+		      p_address = cc_xstrdup(inet_ntoa(ra.sin_addr));
+#endif
+		    }
+		  if (strlen(p_port) == 0)
+		    {
+		      cc_xfree(p_port);
+		      p_port = cc_xmalloc(16);
+#ifdef _XBOX
+		      sprintf(p_port, "%d", (int)(ntohs(ra.sin_port)));
+#else
+		      snprintf(p_port, 16, "%d", (int)(ntohs(ra.sin_port)));
+#endif
+		    }
+		  cc_buffer_append_string(buf, ">");
+		  cc_buffer_append_string(buf, p_address);
+		  cc_buffer_append_string(buf, ":");
+		  cc_buffer_append_string(buf, p_port);
+		  cc_buffer_append_string(buf, "<");
+		  ch = 0;
+		  /* Terminate both buffers with '\0' */
+		  cc_buffer_append(buf, &ch, 1);
+		  cc_buffer_append(seen_buf, &ch, 1);
+		  if (strstr((char *)cc_buffer_ptr(seen_buf), (char *)cc_buffer_ptr(buf)) == NULL)
+		    {
+		      /* Don't forget to remove the terminating '\0' */
+		      cc_buffer_consume_end(seen_buf, 1);
+		      cc_buffer_append_string(seen_buf, (char *)cc_buffer_ptr(buf));
+		      if (callback != NULL)
+			(*callback)(p_address, p_port, p_version, p_comment, context);
+		      found++;
+		    }
+		  else
+		    {
+		      /* Don't forget to remove the terminating '\0' */
+		      cc_buffer_consume_end(seen_buf, 1);
+		    }
+		  cc_buffer_clear(buf);
+		  cc_xfree(p_address);
+		  cc_xfree(p_port);
+		  cc_xfree(p_version);
+		  cc_xfree(p_comment);
+		}
+	    }
+	  cc_buffer_uninit(buf);
+	  break;
+	}
+    }
+#if defined (_XBOX) || defined (WIN32)
+  closesocket(sock);
+#else
+  close(sock);
+#endif
+  cc_xfree(packet);
+
+  return (found > 0) ? CC_XSTREAM_CLIENT_OK : CC_XSTREAM_CLIENT_SERVER_NOT_FOUND;
+}
+
+/* eof (ccxdiscover.c) */

Copied: branches/linuxport/XBMC/xbmc/lib/libXBMS/ccxencode.c (from rev 14127, branches/linuxport/sources/libxbms/ccxencode.c)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libXBMS/ccxencode.c	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libXBMS/ccxencode.c	2008-07-15 21:09:18 UTC (rev 14129)
@@ -0,0 +1,178 @@
+// Place the code and data below here into the LIBXBMS section.
+#pragma code_seg( "LIBXBMS" )
+#pragma data_seg( "LIBXBMS_RW" )
+#pragma bss_seg( "LIBXBMS_RW" )
+#pragma const_seg( "LIBXBMS_RD" )
+#pragma comment(linker, "/merge:LIBXBMS_RW=LIBXBMS")
+#pragma comment(linker, "/merge:LIBXBMS_RD=LIBXBMS")/*   -*- c -*-
+ * 
+ *  ----------------------------------------------------------------------
+ *  Protocol packet encode/decode for CcXstream Server for XBOX Media Player
+ *  ----------------------------------------------------------------------
+ *
+ *  Copyright (c) 2002-2003 by PuhPuh
+ *  
+ *  This code is copyrighted property of the author.  It can still
+ *  be used for any non-commercial purpose following conditions:
+ *  
+ *      1) This copyright notice is not removed.
+ *      2) Source code follows any distribution of the software
+ *         if possible.
+ *      3) Copyright notice above is found in the documentation
+ *         of the distributed software.
+ *  
+ *  Any express or implied warranties are disclaimed.  Author is
+ *  not liable for any direct or indirect damages caused by the use
+ *  of this software.
+ *
+ *  ----------------------------------------------------------------------
+ *
+ *  This code has been integrated into Xbox Media Player.  
+ *  As such it can me copied, redistributed and modified under
+ *  the same conditions as the XBMP itself.
+ *
+ */
+
+#include "ccincludes.h"
+#include "ccbuffer.h"
+#include "ccxencode.h"
+
+void cc_xstream_encode_int(unsigned char *buf, unsigned long x)
+{
+  buf[3] = (unsigned char)(x & 0xff);
+  x >>= 8;
+  buf[2] = (unsigned char)(x & 0xff);
+  x >>= 8;
+  buf[1] = (unsigned char)(x & 0xff);
+  x >>= 8;
+  buf[0] = (unsigned char)(x & 0xff);
+}
+
+void cc_xstream_buffer_encode_int(CcBuffer buf, unsigned long x)
+{
+  cc_buffer_append_space(buf, 4);
+  cc_xstream_encode_int(cc_buffer_ptr(buf) + cc_buffer_len(buf) - 4, x);
+}
+
+void cc_xstream_buffer_encode_int64(CcBuffer buf, CC_UINT_64_TYPE_NAME x)
+{
+  unsigned char nb[8];
+
+  nb[7] = (unsigned char)(x & 0xff);
+  x >>= 8;
+  nb[6] = (unsigned char)(x & 0xff);
+  x >>= 8;
+  nb[5] = (unsigned char)(x & 0xff);
+  x >>= 8;
+  nb[4] = (unsigned char)(x & 0xff);
+  x >>= 8;
+  nb[3] = (unsigned char)(x & 0xff);
+  x >>= 8;
+  nb[2] = (unsigned char)(x & 0xff);
+  x >>= 8;
+  nb[1] = (unsigned char)(x & 0xff);
+  x >>= 8;
+  nb[0] = (unsigned char)(x & 0xff);
+  cc_buffer_append(buf, nb, 8);
+}
+
+void cc_xstream_buffer_encode_byte(CcBuffer buf, unsigned char b)
+{
+  cc_buffer_append(buf, &b, 1);
+}
+
+void cc_xstream_buffer_encode_data_string(CcBuffer buf, const unsigned char *str, size_t str_len)
+{
+  cc_xstream_buffer_encode_int(buf, (unsigned long)str_len);
+  cc_buffer_append(buf, str, str_len);
+}
+
+void cc_xstream_buffer_encode_string(CcBuffer buf, const char *str)
+{
+  size_t str_len;
+
+  str_len = strlen(str);
+  cc_xstream_buffer_encode_int(buf, (unsigned long)str_len);
+  cc_buffer_append(buf, str, str_len);
+}
+
+void cc_xstream_buffer_encode_packet_length(CcBuffer buf)
+{
+  unsigned long len;
+  unsigned char hlp[4];
+
+  len = (unsigned long)cc_buffer_len(buf);
+  cc_xstream_encode_int(hlp, len);
+  cc_buffer_prepend(buf, hlp, 4);
+}
+
+
+unsigned long cc_xstream_decode_int(const unsigned char *buf)
+{
+  unsigned long r;
+
+  r = (unsigned long)(buf[0]);
+  r <<= 8;
+  r |= (unsigned long)(buf[1]);
+  r <<= 8;
+  r |= (unsigned long)(buf[2]);
+  r <<= 8;
+  r |= (unsigned long)(buf[3]);
+  return r;
+}
+
+int cc_xstream_buffer_decode_int(CcBuffer buf, unsigned long *x)
+{
+  if (cc_buffer_len(buf) < 4)
+    return 0;
+  *x = cc_xstream_decode_int(cc_buffer_ptr(buf));
+  cc_buffer_consume(buf, 4);
+  return 1;
+}
+
+int cc_xstream_buffer_decode_int64(CcBuffer buf, CC_UINT_64_TYPE_NAME *x)
+{
+  CC_UINT_64_TYPE_NAME r;
+  unsigned char *b;
+  int i;
+
+  if (cc_buffer_len(buf) < 8)
+    return 0;
+  r = 0;
+  for (i = 0; i < 8; i++)
+    {
+      b = cc_buffer_ptr(buf) + i;
+      r = (r << 8) | (CC_UINT_64_TYPE_NAME)(*b);
+    }
+  *x = r;
+  cc_buffer_consume(buf, 8);
+  return 1;
+}
+
+int cc_xstream_buffer_decode_byte(CcBuffer buf, unsigned char *b)
+{
+  if (cc_buffer_len(buf) < 1)
+    return 0;
+  *b = *(cc_buffer_ptr(buf));
+  cc_buffer_consume(buf, 1);
+  return 1;
+}
+
+int cc_xstream_buffer_decode_string(CcBuffer buf, unsigned char **str, size_t *str_len)
+{
+  unsigned long len;
+
+  if (cc_buffer_len(buf) < 4)
+    return 0;
+  len = cc_xstream_decode_int(cc_buffer_ptr(buf));
+  if ((len + 4) > cc_buffer_len(buf))
+    return 0;
+  cc_buffer_consume(buf, 4);
+  if (str_len != NULL)
+    *str_len = (size_t)len;
+  *str = cc_xmemdup(cc_buffer_ptr(buf), len);
+  cc_buffer_consume(buf, len);
+  return 1;
+}
+
+/* eof (ccxencode.c) */

Copied: branches/linuxport/XBMC/xbmc/lib/libXBMS/ccxmltrans.c (from rev 14127, branches/linuxport/sources/libxbms/ccxmltrans.c)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libXBMS/ccxmltrans.c	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libXBMS/ccxmltrans.c	2008-07-15 21:09:18 UTC (rev 14129)
@@ -0,0 +1,157 @@
+// Place the code and data below here into the LIBXBMS section.
+#pragma code_seg( "LIBXBMS" )
+#pragma data_seg( "LIBXBMS_RW" )
+#pragma bss_seg( "LIBXBMS_RW" )
+#pragma const_seg( "LIBXBMS_RD" )
+#pragma comment(linker, "/merge:LIBXBMS_RW=LIBXBMS")
+#pragma comment(linker, "/merge:LIBXBMS_RD=LIBXBMS")
+
+/*   -*- c -*-
+ * 
+ *  ----------------------------------------------------------------------
+ *  Translate raw strings so that they can be inserted into xml.
+ *  ----------------------------------------------------------------------
+ *
+ *  Copyright (c) 2002-2003 by PuhPuh
+ *  
+ *  This code is copyrighted property of the author.  It can still
+ *  be used for any non-commercial purpose following conditions:
+ *  
+ *      1) This copyright notice is not removed.
+ *      2) Source code follows any distribution of the software
+ *         if possible.
+ *      3) Copyright notice above is found in the documentation
+ *         of the distributed software.
+ *  
+ *  Any express or implied warranties are disclaimed.  Author is
+ *  not liable for any direct or indirect damages caused by the use
+ *  of this software.
+ *
+ *  ----------------------------------------------------------------------
+ *
+ *  This code has been integrated into Xbox Media Player.  
+ *  As such it can me copied, redistributed and modified under
+ *  the same conditions as the XBMP itself.
+ *
+ */
+
+#include "ccincludes.h"
+#include "ccbuffer.h"
+#include "ccxmltrans.h"
+
+typedef struct {
+   char *raw;
+   char *xml;
+} CcXstreamXmlTranslationRec, *CcXstreamXmlTranslation;
+
+#pragma code_seg()
+#pragma data_seg( )
+#pragma bss_seg( )
+#pragma const_seg(  )
+
+static CcXstreamXmlTranslationRec cc_xml_translation[] = {
+  { ">", "&gt;" },
+  { "<", "&lt;" },
+  { "/", "&slash;" },
+  { "\\", "&backslash;" },
+  { "\"", "&doublequote;" },
+  { "&", "&amp;" },
+  { NULL, NULL }
+};
+
+#pragma code_seg( "LIBXBMS" )
+#pragma data_seg( "LIBXBMS_RW" )
+#pragma bss_seg( "LIBXBMS_RW" )
+#pragma const_seg( "LIBXBMS_RD" )
+#pragma comment(linker, "/merge:LIBXBMS_RW=LIBXBMS")
+#pragma comment(linker, "/merge:LIBXBMS_RD=LIBXBMS")
+
+
+char *cc_xstream_xml_encode(const char *raw)
+{
+  CcBufferRec buf[1];
+  const char *tmp;
+  char *r, cb[16];
+  int i;
+  unsigned int x;
+
+  cc_buffer_init(buf);
+  for (tmp = raw; *tmp != '\0'; /*NOTHING*/)
+    {
+      for (i = 0; cc_xml_translation[i].raw != NULL; i++)
+	{
+	  if (strncmp(tmp, cc_xml_translation[i].raw, strlen(cc_xml_translation[i].raw)) == 0)
+	    {
+	      cc_buffer_append_string(buf, cc_xml_translation[i].xml);
+	      tmp += strlen(cc_xml_translation[i].raw);
+	      break;
+	    }
+	}
+      if (cc_xml_translation[i].raw == NULL)
+	{
+	  if (isprint(*tmp) && ((! isspace(*tmp)) || (*tmp == ' ')))
+	    {
+	      cc_buffer_append(buf, tmp, 1);
+	    }
+	  else
+	    {
+	      x = (unsigned int)(*tmp);
+	      sprintf(cb, "&%04x;", x);
+	      cc_buffer_append_string(buf, cb);
+	    }
+	  tmp++;
+	}
+    }
+  r = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
+  cc_buffer_uninit(buf);
+  return r;
+}
+
+char *cc_xstream_xml_decode(const char *xml)
+{
+  CcBufferRec buf[1];
+  const char *tmp;
+  char *r;
+  unsigned long l;
+  unsigned char c;
+  int i;
+
+  cc_buffer_init(buf);
+  for (tmp = xml; *tmp != '\0'; /*NOTHING*/)
+    {
+      for (i = 0; cc_xml_translation[i].xml != NULL; i++)
+	{
+	  if (strncmp(tmp, cc_xml_translation[i].xml, strlen(cc_xml_translation[i].xml)) == 0)
+	    {
+	      cc_buffer_append_string(buf, cc_xml_translation[i].raw);
+	      tmp += strlen(cc_xml_translation[i].xml);
+	      break;
+	    }
+	}
+      if (cc_xml_translation[i].raw == NULL)
+	{
+	  if ((tmp[0] == '&') &&
+	      (tmp[1] == '0') &&
+	      (tmp[2] == '0') &&
+	      (isxdigit(tmp[3])) &&
+	      (isxdigit(tmp[4])) &&
+	      (tmp[5] == ';'))
+	    {
+	      l = strtoul(tmp + 1, NULL, 16);
+	      c = (unsigned char)l;
+	      cc_buffer_append(buf, &c, 1);
+	      tmp += 6;
+	    }
+	  else
+	    {
+	      cc_buffer_append(buf, tmp, 1);
+	      tmp++;
+	    }
+	}
+    }
+  r = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
+  cc_buffer_uninit(buf);
+  return r;
+}
+
+/* eof (ccxmltrans.c) */

Copied: branches/linuxport/XBMC/xbmc/lib/libXBMS/libXBMS.sln (from rev 14127, branches/linuxport/sources/libxbms/libXBMS.sln)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libXBMS/libXBMS.sln	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libXBMS/libXBMS.sln	2008-07-15 21:09:18 UTC (rev 14129)
@@ -0,0 +1,30 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libXBMS", "libXBMS.vcproj", "{99DAF33B-4EB3-4816-B583-44E8B0758FC9}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Profile = Profile
+		Profile_FastCap = Profile_FastCap
+		Release = Release
+		Release_LTCG = Release_LTCG
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{99DAF33B-4EB3-4816-B583-44E8B0758FC9}.Debug.ActiveCfg = Debug|Xbox
+		{99DAF33B-4EB3-4816-B583-44E8B0758FC9}.Debug.Build.0 = Debug|Xbox
+		{99DAF33B-4EB3-4816-B583-44E8B0758FC9}.Profile.ActiveCfg = Profile|Xbox
+		{99DAF33B-4EB3-4816-B583-44E8B0758FC9}.Profile.Build.0 = Profile|Xbox
+		{99DAF33B-4EB3-4816-B583-44E8B0758FC9}.Profile_FastCap.ActiveCfg = Profile_FastCap|Xbox
+		{99DAF33B-4EB3-4816-B583-44E8B0758FC9}.Profile_FastCap.Build.0 = Profile_FastCap|Xbox
+		{99DAF33B-4EB3-4816-B583-44E8B0758FC9}.Release.ActiveCfg = Release|Xbox
+		{99DAF33B-4EB3-4816-B583-44E8B0758FC9}.Release.Build.0 = Release|Xbox
+		{99DAF33B-4EB3-4816-B583-44E8B0758FC9}.Release_LTCG.ActiveCfg = Release_LTCG|Xbox
+		{99DAF33B-4EB3-4816-B583-44E8B0758FC9}.Release_LTCG.Build.0 = Release_LTCG|Xbox
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal

Copied: branches/linuxport/XBMC/xbmc/lib/libXBMS/libXBMS.vcproj (from rev 14127, branches/linuxport/sources/libxbms/libXBMS.vcproj)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libXBMS/libXBMS.vcproj	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libXBMS/libXBMS.vcproj	2008-07-15 21:09:18 UTC (rev 14129)
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="libXBMS"
+	ProjectGUID="{99DAF33B-4EB3-4816-B583-44E8B0758FC9}"
+	Keyword="XboxProj">
+	<Platforms>
+		<Platform
+			Name="Xbox"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Xbox"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				OptimizeForProcessor="2"
+				PreprocessorDefinitions="_DEBUG;_XBOX;_LIB"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="TRUE"
+				EnableEnhancedInstructionSet="1"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile="$(OutDir)/$(ProjectName).pch"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/$(ProjectName)d.lib"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+		</Configuration>
+		<Configuration
+			Name="Profile|Xbox"
+			OutputDirectory="Profile"
+			IntermediateDirectory="Profile"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				OmitFramePointers="TRUE"
+				OptimizeForProcessor="2"
+				PreprocessorDefinitions="NDEBUG;_XBOX;PROFILE;_LIB"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				EnableEnhancedInstructionSet="1"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile="$(OutDir)/$(ProjectName).pch"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/$(ProjectName).lib"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+		</Configuration>
+		<Configuration
+			Name="Profile_FastCap|Xbox"
+			OutputDirectory="Profile_FastCap"
+			IntermediateDirectory="Profile_FastCap"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				OmitFramePointers="TRUE"
+				OptimizeForProcessor="2"
+				PreprocessorDefinitions="NDEBUG;_XBOX;PROFILE;FASTCAP;_LIB"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				EnableEnhancedInstructionSet="1"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile="$(OutDir)/$(ProjectName).pch"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"
+				FastCAP="TRUE"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/$(ProjectName).lib"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Xbox"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				GlobalOptimizations="TRUE"
+				FavorSizeOrSpeed="2"
+				OmitFramePointers="TRUE"
+				OptimizeForProcessor="2"
+				PreprocessorDefinitions="NDEBUG;_XBOX;_LIB"
+				StringPooling="FALSE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				EnableEnhancedInstructionSet="1"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile="$(OutDir)/$(ProjectName).pch"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/$(ProjectName).lib"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release_LTCG|Xbox"
+			OutputDirectory="Release_LTCG"
+			IntermediateDirectory="Release_LTCG"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="TRUE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				OmitFramePointers="TRUE"
+				OptimizeForProcessor="2"
+				PreprocessorDefinitions="NDEBUG;_XBOX;LTCG;_LIB"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				EnableEnhancedInstructionSet="1"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile="$(OutDir)/$(ProjectName).pch"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/$(ProjectName).lib"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
+			<File
+				RelativePath="ccbuffer.c">
+			</File>
+			<File
+				RelativePath="ccbuffer.h">
+			</File>
+			<File
+				RelativePath="ccincludes.h">
+			</File>
+			<File
+				RelativePath="ccutil.c">
+			</File>
+			<File
+				RelativePath="ccutil.h">
+			</File>
+			<File
+				RelativePath="ccxclient.c">
+			</File>
+			<File
+				RelativePath="ccxclient.h">
+			</File>
+			<File
+				RelativePath="ccxclientconnxbox.c">
+			</File>
+			<File
+				RelativePath="ccxdiscover.c">
+			</File>
+			<File
+				RelativePath="ccxencode.c">
+			</File>
+			<File
+				RelativePath="ccxencode.h">
+			</File>
+			<File
+				RelativePath="ccxmltrans.c">
+			</File>
+			<File
+				RelativePath="ccxmltrans.h">
+			</File>
+			<File
+				RelativePath="ccxpacket.h">
+			</File>
+			<File
+				RelativePath="ccxversion.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc">
+		</Filter>
+		<File
+			RelativePath="ReadMe.txt">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Deleted: branches/linuxport/XBMC/xbmc/lib/libXBMS/libxbms-i486-linux.a
===================================================================
(Binary files differ)

Deleted: branches/linuxport/sources/libxbms/Makefile
===================================================================
--- branches/linuxport/sources/libxbms/Makefile	2008-07-15 19:47:35 UTC (rev 14128)
+++ branches/linuxport/sources/libxbms/Makefile	2008-07-15 21:09:18 UTC (rev 14129)
@@ -1,20 +0,0 @@
-AR = ar
-ARFLAGS = rus
-RM = rm -f
-
-CXX=g++
-CC=gcc
-
-OBJS := ccbuffer.o ccutil.o ccxclient.o ccxclientconnxbox.o ccxdiscover.o ccxencode.o ccxmltrans.o
-
-.c.o:
-	rm -f ${<:.c=.o}
-	$(CC) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.c=.o}
-
-libxbms.a: $(OBJS)
-	$(AR) $(ARFLAGS) libxbms.a $(OBJS)
-
-all: libxbms.a
-
-clean:
-	$(RM) $(OBJS) libxbms.a

Deleted: branches/linuxport/sources/libxbms/ccbuffer.c
===================================================================
--- branches/linuxport/sources/libxbms/ccbuffer.c	2008-07-15 19:47:35 UTC (rev 14128)
+++ branches/linuxport/sources/libxbms/ccbuffer.c	2008-07-15 21:09:18 UTC (rev 14129)
@@ -1,182 +0,0 @@
-// Place the code and data below here into the LIBXBMS section.
-#pragma code_seg( "LIBXBMS" )
-#pragma data_seg( "LIBXBMS_RW" )
-#pragma bss_seg( "LIBXBMS_RW" )
-#pragma const_seg( "LIBXBMS_RD" )
-#pragma comment(linker, "/merge:LIBXBMS_RW=LIBXBMS")
-#pragma comment(linker, "/merge:LIBXBMS_RD=LIBXBMS")
-/*   -*- c -*-
- * 
- *  ----------------------------------------------------------------------
- *  Buffer stuff.
- *  ----------------------------------------------------------------------
- *
- *  Copyright (c) 2002-2003 by PuhPuh
- *  
- *  This code is copyrighted property of the author.  It can still
- *  be used for any non-commercial purpose following conditions:
- *  
- *      1) This copyright notice is not removed.
- *      2) Source code follows any distribution of the software
- *         if possible.
- *      3) Copyright notice above is found in the documentation
- *         of the distributed software.
- *  
- *  Any express or implied warranties are disclaimed.  Author is
- *  not liable for any direct or indirect damages caused by the use
- *  of this software.
- *
- *  ----------------------------------------------------------------------
- *
- *  This code has been integrated into Xbox Media Player.  
- *  As such it can me copied, redistributed and modified under
- *  the same conditions as the XBMP itself.
- *
- */
-
-
-#include "ccincludes.h"
-#include "ccbuffer.h"
-
-CcBuffer cc_buffer_allocate(void)
-{
-  CcBuffer buffer;
-
-  buffer = cc_xcalloc(1, sizeof (*buffer));
-  return buffer;
-}
-
-void cc_buffer_free(CcBuffer buffer)
-{
-  cc_buffer_uninit(buffer);
-  cc_xfree(buffer);
-}
-
-void cc_buffer_init(CcBuffer buffer)
-{
-  memset(buffer, 0, sizeof (*buffer));
-}
-
-void cc_buffer_uninit(CcBuffer buffer)
-{
-  if (buffer != NULL)
-    cc_xfree(buffer->data);
-  memset(buffer, 0, sizeof (*buffer));
-}
-
-size_t cc_buffer_len(CcBuffer buffer)
-{
-  return buffer->len;
-}
-
-unsigned char *cc_buffer_ptr(CcBuffer buffer)
-{
-  return buffer->data;
-}
-
-void cc_buffer_append(CcBuffer buffer, const unsigned char *data, size_t len)
-{
-  size_t ol;
-
-  ol = cc_buffer_len(buffer);
-  cc_buffer_append_space(buffer, len);
-  memcpy(buffer->data + ol, data, len);
-}
-
-void cc_buffer_prepend(CcBuffer buffer, const unsigned char *data, size_t len)
-{
-  size_t ol;
-
-  ol = cc_buffer_len(buffer);
-  cc_buffer_append_space(buffer, len);
-  memmove(buffer->data + len, buffer->data, ol);
-  memcpy(buffer->data, data, len);
-}
-
-void cc_buffer_append_space(CcBuffer buffer, size_t len)
-{
-  if (len > 0)
-    {
-      if (buffer->data == NULL)
-	{
-	  buffer->data = cc_xmalloc(len);
-	  buffer->len = 0;
-	}
-      else
-	{
-	  buffer->data = cc_xrealloc(buffer->data, buffer->len + len);
-	}
-      buffer->len += len;
-    }
-}
-
-void cc_buffer_append_string(CcBuffer buffer, const char *string)
-{
-  if (*string != '\0')
-    cc_buffer_append(buffer, (const unsigned char *)string, strlen(string));
-}
-
-void cc_buffer_prepend_string(CcBuffer buffer, const char *string)
-{
-  if (*string != '\0')
-    cc_buffer_prepend(buffer, (const unsigned char *)string, strlen(string));
-}
-
-void cc_buffer_consume(CcBuffer buffer, size_t len)
-{
-  if (len > buffer->len)
-    {
-      cc_fatal("Buffer underflow.");
-    }
-  else if (len == 0)
-    {
-      /*NOTHING*/;
-    }
-  else if (len == buffer->len)
-    {
-      buffer->len = 0;
-    }
-  else
-    {
-      memmove(buffer->data, buffer->data + len, buffer->len - len);
-      buffer->len -= len;
-    }
-}
-
-void cc_buffer_consume_end(CcBuffer buffer, size_t len)
-{
-  if (len > buffer->len)
-    {
-      cc_fatal("Buffer underflow.");
-    }
-  else if (len == 0)
-    {
-      /*NOTHING*/;
-    }
-  else if (len == buffer->len)
-    {
-      buffer->len = 0;
-    }
-  else
-    {
-      buffer->len -= len;
-    }
-}
-
-void cc_buffer_clear(CcBuffer buffer)
-{
-  buffer->len = 0;
-}
-
-void cc_buffer_steal(CcBuffer buffer, unsigned char **data, size_t *len)
-{
-  buffer->data = cc_xrealloc(buffer->data, buffer->len + 1);
-  buffer->data[buffer->len] = '\0';
-  *data = buffer->data;
-  if (len != NULL)
-    *len = buffer->len;
-  buffer->data = NULL;
-  buffer->len = 0;
-}
-
-/* eof (ccbuffer.c) */

Deleted: branches/linuxport/sources/libxbms/ccutil.c
===================================================================
--- branches/linuxport/sources/libxbms/ccutil.c	2008-07-15 19:47:35 UTC (rev 14128)
+++ branches/linuxport/sources/libxbms/ccutil.c	2008-07-15 21:09:18 UTC (rev 14129)
@@ -1,107 +0,0 @@
-// Place the code and data below here into the LIBXBMS section.
-#pragma code_seg( "LIBXBMS" )
-#pragma data_seg( "LIBXBMS_RW" )
-#pragma bss_seg( "LIBXBMS_RW" )
-#pragma const_seg( "LIBXBMS_RD" )
-#pragma comment(linker, "/merge:LIBXBMS_RW=LIBXBMS")
-#pragma comment(linker, "/merge:LIBXBMS_RD=LIBXBMS")/*   -*- c -*-
- * 
- *  ----------------------------------------------------------------------
- *  Misc utilities.
- *  ----------------------------------------------------------------------
- *
- *  Copyright (c) 2002-2003 by PuhPuh
- *  
- *  This code is copyrighted property of the author.  It can still
- *  be used for any non-commercial purpose following conditions:
- *  
- *      1) This copyright notice is not removed.
- *      2) Source code follows any distribution of the software
- *         if possible.
- *      3) Copyright notice above is found in the documentation
- *         of the distributed software.
- *  
- *  Any express or implied warranties are disclaimed.  Author is
- *  not liable for any direct or indirect damages caused by the use
- *  of this software.
- *
- *  ----------------------------------------------------------------------
- *
- *  This code has been integrated into Xbox Media Player.  
- *  As such it can me copied, redistributed and modified under
- *  the same conditions as the XBMP itself.
- *
- */
-
-
-#include "ccincludes.h"
-#include "ccutil.h"
-
-void cc_fatal(const char *m)
-{
-#if 0
-  fprintf(stderr, "FATAL ERROR%s%s\n", 
-	  (m != NULL) ? ": " : "",
-	  (m != NULL) ? m :  "");
-#endif
-  exit(-1);
-}
-
-void *cc_xmalloc(size_t n)
-{
-  void *r;
-
-  r = malloc(n);
-  if (r == NULL)
-    cc_fatal("Out of memory");
-  return r;
-}
-
-void *cc_xcalloc(size_t n, size_t s)
-{
-  void *r;
-
-  r = calloc(n, s);
-  if (r == NULL)
-    cc_fatal("Out of memory");
-  return r;
-}
-
-void *cc_xrealloc(void *o, size_t n)
-{
-  void *r;
-
-  r = realloc(o, n);
-  if (r == NULL)
-    cc_fatal("Out of memory");
-  return r;
-}
-
-void *cc_xstrdup(const char *s)
-{
-  char *r;
-
-  r = strdup(s != NULL ? s : "");
-  if (r == NULL)
-    cc_fatal("Out of memory");
-  return r;
-}
-
-void *cc_xmemdup(const void *s, size_t len)
-{
-  unsigned char *r;
-
-  r = cc_xmalloc(len + 1);
-  r[len] = '\0';
-  if (len > 0)
-    memcpy(r, s, len);
-  return (void *)r;
-}
-
-void cc_xfree(void *p)
-{
-  if (p != NULL)
-    free(p);
-}
-
-/* eof (ccutil.c) */

Deleted: branches/linuxport/sources/libxbms/ccxclient.c
===================================================================
--- branches/linuxport/sources/libxbms/ccxclient.c	2008-07-15 19:47:35 UTC (rev 14128)
+++ branches/linuxport/sources/libxbms/ccxclient.c	2008-07-15 21:09:18 UTC (rev 14129)
@@ -1,1255 +0,0 @@
-// Place the code and data below here into the LIBXBMS section.
-#pragma code_seg( "LIBXBMS" )
-#pragma data_seg( "LIBXBMS_RW" )
-#pragma bss_seg( "LIBXBMS_RW" )
-#pragma const_seg( "LIBXBMS_RD" )
-#pragma comment(linker, "/merge:LIBXBMS_RW=LIBXBMS")
-#pragma comment(linker, "/merge:LIBXBMS_RD=LIBXBMS")/*   -*- c -*-
- * 
- *  ----------------------------------------------------------------------
- *  CcXstream Client Library for XBOX Media Player
- *  ----------------------------------------------------------------------
- *
- *  Copyright (c) 2002-2003 by PuhPuh
- *  
- *  This code is copyrighted property of the author.  It can still
- *  be used for any non-commercial purpose following conditions:
- *  
- *      1) This copyright notice is not removed.
- *      2) Source code follows any distribution of the software
- *         if possible.
- *      3) Copyright notice above is found in the documentation
- *         of the distributed software.
- *  
- *  Any express or implied warranties are disclaimed.  Author is
- *  not liable for any direct or indirect damages caused by the use
- *  of this software.
- *
- *  ----------------------------------------------------------------------
- *
- *  This code has been integrated into Xbox Media Player.  
- *  As such it can me copied, redistributed and modified under
- *  the same conditions as the XBMP itself.
- *
- */
-
-#include "ccincludes.h"
-#include "ccbuffer.h"
-#include "ccxclient.h"
-#include "ccxencode.h"
-
-#pragma code_seg()
-#pragma data_seg( )
-#pragma bss_seg( )
-#pragma const_seg(  )
-
-static unsigned long lNextId = 0;
-unsigned long next_id()
-{
-  
-  lNextId = lNextId + 1 % 0xfffff; /* 20 bits in maximum */
-  if (lNextId == 0)
-    lNextId++;
-  return (lNextId << 12); /* Low 12 bits are zero */
-}
-
-#pragma code_seg( "LIBXBMS" )
-#pragma data_seg( "LIBXBMS_RW" )
-#pragma bss_seg( "LIBXBMS_RW" )
-#pragma const_seg( "LIBXBMS_RD" )
-#pragma comment(linker, "/merge:LIBXBMS_RW=LIBXBMS")
-#pragma comment(linker, "/merge:LIBXBMS_RD=LIBXBMS")
-
-CcXstreamClientError cc_xstream_client_version_handshake(CcXstreamServerConnection s)
-{
-  unsigned char *c, x;
-  CcBufferRec buf[1];
-  char *hlp1, *hlp2, *hlp3;
-  int i;
-
-  cc_buffer_init(buf);
-  
-  for (i = 0; 1; i++)
-    {
-      if (i > 2048)
-	{
-	  cc_buffer_uninit(buf);
-	  return CC_XSTREAM_CLIENT_FATAL_ERROR;
-	}
-      c = cc_xstream_client_read_data(s, 1, CCXSTREAM_CLIENT_TIMEOUT_SECONDS * 1000U);
-      if (c == NULL)
-	{
-	  cc_buffer_uninit(buf);
-	  return CC_XSTREAM_CLIENT_FATAL_ERROR;
-	}
-      x = c[0];
-      cc_xfree(c);
-      if (x == '\n')
-	break;
-      else if (x != '\r')
-	cc_buffer_append(buf, &x, 1);
-    }
-  hlp1 = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
-  cc_buffer_uninit(buf);
-  /* OK, we parse the version string.  Supported versions are between
-     the first and the second space characters in the string.
-     Versions are in the comma separated list.  This code is somewhat
-     spaghetti, but it does the trick and ensures that supported
-     versions list contain string CC_XSTREAM_CLIENT_VERSION.  The
-     reason for complexity is that it can be the first or last item in
-     the list.  It can also be the only item in the list.  And of
-     course string we got from the server may be nonstandard and we
-     can't crash because of it. */
-  hlp2 = strchr(hlp1, ' ');
-  if (hlp2 == NULL)
-    {
-      cc_xfree(hlp1);
-      return CC_XSTREAM_CLIENT_FATAL_ERROR;
-    }
-  hlp2++;
-  hlp3 = strchr(hlp2, ' ');
-  if (hlp3 == NULL)
-    {
-      cc_xfree(hlp1);
-      return CC_XSTREAM_CLIENT_FATAL_ERROR;
-    }
-  *hlp3 = '\0';
-  while ((hlp3 = strrchr(hlp2, ',')) != NULL)
-    {
-      *hlp3 = '\0';
-      hlp3++;
-      if (strcmp(hlp3, CC_XSTREAM_CLIENT_VERSION) == 0)
-	break;
-    }
-  if (hlp3 == NULL)
-    {
-      if (strcmp(hlp2, CC_XSTREAM_CLIENT_VERSION) != 0)
-	{
-	  cc_xfree(hlp1);
-	  return CC_XSTREAM_CLIENT_FATAL_ERROR;
-	}
-    }
-  cc_xfree(hlp1);
-  if (cc_xstream_client_write_data(s, CC_XSTREAM_CLIENT_VERSION_STR "\n", strlen(CC_XSTREAM_CLIENT_VERSION_STR  "\n"), 0) == 0)
-    return CC_XSTREAM_CLIENT_FATAL_ERROR;
-  return CC_XSTREAM_CLIENT_OK;
-}
-
-unsigned long cc_xstream_client_mkpacket_setcwd(const char *path, 
-						unsigned char **p, size_t *p_len)
-{
-  CcBufferRec buf[1];
-  unsigned int r;
-
-  /* Initialize the buffer. */
-  cc_buffer_init(buf);
-  /* Encode packet */
-  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_SETCWD);
-  r = next_id();
-  cc_xstream_buffer_encode_int(buf, r);
-  cc_xstream_buffer_encode_string(buf, path);
-  cc_xstream_buffer_encode_packet_length(buf);
-  /* Return payload */
-  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
-  *p_len = cc_buffer_len(buf);
-  /* Free the buffer */
-  cc_buffer_uninit(buf);
-  /* Return the command id. */
-  return r;
-}
-
-unsigned long cc_xstream_client_mkpacket_upcwd(unsigned long levels,
-					       unsigned char **p, size_t *p_len)
-{
-  CcBufferRec buf[1];
-  unsigned int r;
-
-  /* Initialize the buffer. */
-  cc_buffer_init(buf);
-  /* Encode packet */
-  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_UPCWD);
-  r = next_id();
-  cc_xstream_buffer_encode_int(buf, r);
-  cc_xstream_buffer_encode_int(buf, levels);
-  cc_xstream_buffer_encode_packet_length(buf);
-  /* Return payload */
-  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
-  *p_len = cc_buffer_len(buf);
-  /* Free the buffer */
-  cc_buffer_uninit(buf);
-  /* Return the command id. */
-  return r;
-}
-
-unsigned long cc_xstream_client_mkpacket_filelist_open(unsigned char **p, size_t *p_len)
-{
-  CcBufferRec buf[1];
-  unsigned int r;
-
-  /* Initialize the buffer. */
-  cc_buffer_init(buf);
-  /* Encode packet */
-  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_FILELIST_OPEN);
-  r = next_id();
-  cc_xstream_buffer_encode_int(buf, r);
-  cc_xstream_buffer_encode_packet_length(buf);
-  /* Return payload */
-  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
-  *p_len = cc_buffer_len(buf);
-  /* Free the buffer */
-  cc_buffer_uninit(buf);
-  /* Return the command id. */
-  return r;
-}
-
-unsigned long cc_xstream_client_mkpacket_filelist_read(unsigned long handle,
-						       unsigned char **p, size_t *p_len)
-{
-  CcBufferRec buf[1];
-  unsigned int r;
-
-  /* Initialize the buffer. */
-  cc_buffer_init(buf);
-  /* Encode packet */
-  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_FILELIST_READ);
-  r = next_id();
-  cc_xstream_buffer_encode_int(buf, r);
-  cc_xstream_buffer_encode_int(buf, handle);
-  cc_xstream_buffer_encode_packet_length(buf);
-  /* Return payload */
-  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
-  *p_len = cc_buffer_len(buf);
-  /* Free the buffer */
-  cc_buffer_uninit(buf);
-  /* Return the command id. */
-  return r;
-}
-
-unsigned long cc_xstream_client_mkpacket_file_info(const char *path,
-						   unsigned char **p, size_t *p_len)
-{
-  CcBufferRec buf[1];
-  unsigned int r;
-
-  /* Initialize the buffer. */
-  cc_buffer_init(buf);
-  /* Encode packet */
-  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_FILE_INFO);
-  r = next_id();
-  cc_xstream_buffer_encode_int(buf, r);
-  cc_xstream_buffer_encode_string(buf, path);
-  cc_xstream_buffer_encode_packet_length(buf);
-  /* Return payload */
-  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
-  *p_len = cc_buffer_len(buf);
-  /* Free the buffer */
-  cc_buffer_uninit(buf);
-  /* Return the command id. */
-  return r;
-}
-
-unsigned long cc_xstream_client_mkpacket_file_open(const char *path,
-						   unsigned char **p, size_t *p_len)
-{
-  CcBufferRec buf[1];
-  unsigned int r;
-
-  /* Initialize the buffer. */
-  cc_buffer_init(buf);
-  /* Encode packet */
-  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_FILE_OPEN);
-  r = next_id();
-  cc_xstream_buffer_encode_int(buf, r);
-  cc_xstream_buffer_encode_string(buf, path);
-  cc_xstream_buffer_encode_packet_length(buf);
-  /* Return payload */
-  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
-  *p_len = cc_buffer_len(buf);
-  /* Free the buffer */
-  cc_buffer_uninit(buf);
-  /* Return the command id. */
-  return r;
-}
-
-unsigned long cc_xstream_client_mkpacket_file_read(unsigned long handle, size_t len,
-						   unsigned char **p, size_t *p_len)
-{
-  CcBufferRec buf[1];
-  unsigned int r;
-
-  /* Initialize the buffer. */
-  cc_buffer_init(buf);
-  /* Encode packet */
-  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_FILE_READ);
-  r = next_id();
-  cc_xstream_buffer_encode_int(buf, r);
-  cc_xstream_buffer_encode_int(buf, handle);
-  cc_xstream_buffer_encode_int(buf, len);
-  cc_xstream_buffer_encode_packet_length(buf);
-  /* Return payload */
-  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
-  *p_len = cc_buffer_len(buf);
-  /* Free the buffer */
-  cc_buffer_uninit(buf);
-  /* Return the command id. */
-  return r;
-}
-
-unsigned long cc_xstream_client_mkpacket_seek(unsigned long handle, 
-					      int seek_type, CC_UINT_64_TYPE_NAME bytes,
-					      unsigned char **p, size_t *p_len)
-{
-  CcBufferRec buf[1];
-  unsigned int r;
-
-  /* Initialize the buffer. */
-  cc_buffer_init(buf);
-  /* Encode packet */
-  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_FILE_SEEK);
-  r = next_id();
-  cc_xstream_buffer_encode_int(buf, r);
-  cc_xstream_buffer_encode_int(buf, handle);
-  cc_xstream_buffer_encode_byte(buf, (unsigned char)seek_type);
-  cc_xstream_buffer_encode_int64(buf, bytes);
-  cc_xstream_buffer_encode_packet_length(buf);
-  /* Return payload */
-  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
-  *p_len = cc_buffer_len(buf);
-  /* Free the buffer */
-  cc_buffer_uninit(buf);
-  /* Return the command id. */
-  return r;
-}
-
-unsigned long cc_xstream_client_mkpacket_close(unsigned long handle,
-					       unsigned char **p, size_t *p_len)
-{
-  CcBufferRec buf[1];
-  unsigned int r;
-
-  /* Initialize the buffer. */
-  cc_buffer_init(buf);
-  /* Encode packet */
-  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_CLOSE);
-  r = next_id();
-  cc_xstream_buffer_encode_int(buf, r);
-  cc_xstream_buffer_encode_int(buf, handle);
-  cc_xstream_buffer_encode_packet_length(buf);
-  /* Return payload */
-  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
-  *p_len = cc_buffer_len(buf);
-  /* Free the buffer */
-  cc_buffer_uninit(buf);
-  /* Return the command id. */
-  return r;
-}
-
-unsigned long cc_xstream_client_mkpacket_close_all(unsigned char **p, size_t *p_len)
-{
-  CcBufferRec buf[1];
-  unsigned int r;
-
-  /* Initialize the buffer. */
-  cc_buffer_init(buf);
-  /* Encode packet */
-  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_CLOSE_ALL);
-  r = next_id();
-  cc_xstream_buffer_encode_int(buf, r);
-  cc_xstream_buffer_encode_packet_length(buf);
-  /* Return payload */
-  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
-  *p_len = cc_buffer_len(buf);
-  /* Free the buffer */
-  cc_buffer_uninit(buf);
-  /* Return the command id. */
-  return r;
-}
-
-unsigned long cc_xstream_client_mkpacket_setconfoption(const char *option, 
-						       const char *value,
-						       unsigned char **p, size_t *p_len)
-{
-  CcBufferRec buf[1];
-  unsigned int r;
-
-  /* Initialize the buffer. */
-  cc_buffer_init(buf);
-  /* Encode packet */
-  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_SET_CONFIGURATION_OPTION);
-  r = next_id();
-  cc_xstream_buffer_encode_int(buf, r);
-  cc_xstream_buffer_encode_string(buf, option);
-  cc_xstream_buffer_encode_string(buf, value);
-  cc_xstream_buffer_encode_packet_length(buf);
-  /* Return payload */
-  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
-  *p_len = cc_buffer_len(buf);
-  /* Free the buffer */
-  cc_buffer_uninit(buf);
-  /* Return the command id. */
-  return r;
-}
-
-unsigned long cc_xstream_client_mkpacket_authentication_init(const char *method,
-	       						     unsigned char **p, size_t *p_len)
-{
-  CcBufferRec buf[1];
-  unsigned int r;
-
-  /* Initialize the buffer. */
-  cc_buffer_init(buf);
-  /* Encode packet */
-  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_AUTHENTICATION_INIT);
-  r = next_id();
-  cc_xstream_buffer_encode_int(buf, r);
-  cc_xstream_buffer_encode_string(buf, method);
-  cc_xstream_buffer_encode_packet_length(buf);
-  /* Return payload */
-  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
-  *p_len = cc_buffer_len(buf);
-  /* Free the buffer */
-  cc_buffer_uninit(buf);
-  /* Return the command id. */
-  return r;
-}
-
-unsigned long cc_xstream_client_mkpacket_authenticate_password(unsigned long handle,
-							       const char *user_id,
-							       const char *password,
-							       unsigned char **p, size_t *p_len)
-{
-  CcBufferRec buf[1];
-  unsigned int r;
-
-  /* Initialize the buffer. */
-  cc_buffer_init(buf);
-  /* Encode packet */
-  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_AUTHENTICATE);
-  r = next_id();
-  cc_xstream_buffer_encode_int(buf, r);
-  cc_xstream_buffer_encode_int(buf, handle);
-  cc_xstream_buffer_encode_string(buf, user_id);
-  cc_xstream_buffer_encode_string(buf, password);
-  cc_xstream_buffer_encode_packet_length(buf);
-  /* Return payload */
-  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
-  *p_len = cc_buffer_len(buf);
-  /* Free the buffer */
-  cc_buffer_uninit(buf);
-  /* Return the command id. */
-  return r;
-}
-
-unsigned long cc_xstream_client_mkpacket_server_discovery(unsigned char **p, size_t *p_len)
-{
-  CcBufferRec buf[1];
-  unsigned int r;
-
-  /* Initialize the buffer. */
-  cc_buffer_init(buf);
-  /* Encode packet. */
-  cc_xstream_buffer_encode_byte(buf, (unsigned char)CC_XSTREAM_XBMSP_PACKET_SERVER_DISCOVERY_QUERY);
-  r = next_id();
-  cc_xstream_buffer_encode_int(buf, r);
-  cc_xstream_buffer_encode_string(buf, CC_XSTREAM_CLIENT_VERSION_STR);
-  cc_xstream_buffer_encode_packet_length(buf);
-  /* Return payload */
-  *p = cc_xmemdup(cc_buffer_ptr(buf), cc_buffer_len(buf));
-  *p_len = cc_buffer_len(buf);
-  /* Free the buffer */
-  cc_buffer_uninit(buf);

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14132
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14132&view=rev
Author:   spiff_
Date:     2008-07-15 14:38:33 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
changed: compile libexif instead of keeping binary in svn (linux x86)

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.in

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/lib/libexif/ExifParse.cpp
    branches/linuxport/XBMC/xbmc/lib/libexif/ExifParse.h
    branches/linuxport/XBMC/xbmc/lib/libexif/IptcParse.cpp
    branches/linuxport/XBMC/xbmc/lib/libexif/IptcParse.h
    branches/linuxport/XBMC/xbmc/lib/libexif/JpegParse.cpp
    branches/linuxport/XBMC/xbmc/lib/libexif/JpegParse.h
    branches/linuxport/XBMC/xbmc/lib/libexif/Makefile
    branches/linuxport/XBMC/xbmc/lib/libexif/libexif.cpp
    branches/linuxport/XBMC/xbmc/lib/libexif/libexif.h
    branches/linuxport/XBMC/xbmc/lib/libexif/libexif.sln
    branches/linuxport/XBMC/xbmc/lib/libexif/libexif.vcproj

Removed Paths:
-------------
    branches/linuxport/XBMC/system/libexif-i486-linux.so
    branches/linuxport/XBMC/xbmc/lib/libexif/libexif.h
    branches/linuxport/sources/libexif/ExifParse.cpp
    branches/linuxport/sources/libexif/ExifParse.h
    branches/linuxport/sources/libexif/IptcParse.cpp
    branches/linuxport/sources/libexif/IptcParse.h
    branches/linuxport/sources/libexif/JpegParse.cpp
    branches/linuxport/sources/libexif/JpegParse.h
    branches/linuxport/sources/libexif/Makefile
    branches/linuxport/sources/libexif/libexif.cpp
    branches/linuxport/sources/libexif/libexif.h
    branches/linuxport/sources/libexif/libexif.sln
    branches/linuxport/sources/libexif/libexif.vcproj

Modified: branches/linuxport/XBMC/Makefile.in
===================================================================
--- branches/linuxport/XBMC/Makefile.in	2008-07-15 21:35:46 UTC (rev 14131)
+++ branches/linuxport/XBMC/Makefile.in	2008-07-15 21:38:33 UTC (rev 14132)
@@ -86,6 +86,8 @@
 	$(MAKE) -C xbmc/lib/libRTMP
 libxbms:
 	$(MAKE) -C xbmc/lib/libXBMS
+libexif:
+	$(MAKE) -C xbmc/lib/libexif
 papcodecs:
 	$(MAKE) -C xbmc/cores/paplayer/AACCodec
 	$(MAKE) -C xbmc/cores/paplayer/AC3Codec
@@ -106,7 +108,7 @@
 	$(MAKE) -C xbmc/cores/paplayer/WavPackCodec
 	$(MAKE) -C xbmc/cores/paplayer/YMCodec
 	
-compile: guilib xbmc filesystem musicdatabase videodatabase cores paplayer dllloader exports xbox linux visualizations screensavers utils common tinyxml sqllite libscrobbler libgoahead unrarxlib libpython dvdplayer libupnp cdrip libcmyth librtmp libxbms papcodecs
+compile: guilib xbmc filesystem musicdatabase videodatabase cores paplayer dllloader exports xbox linux visualizations screensavers utils common tinyxml sqllite libscrobbler libgoahead unrarxlib libpython dvdplayer libupnp cdrip libcmyth librtmp libxbms libexif papcodecs
 
 xbmc.bin: $(wildcard xbmc/*.o xbmc/settings/*.o guilib/*.o guilib/tinyXML/*.o guilib/common/*.o xbmc/FileSystem/*.o xbmc/FileSystem/VideoDatabaseDirectory/*.o xbmc/FileSystem/MusicDatabaseDirectory/*.o xbmc/visualizations/*.o xbmc/screensavers/*.o xbmc/cores/*.o xbmc/cores/paplayer/*.o xbmc/linux/*.o xbmc/lib/sqLite/*.o xbmc/lib/libscrobbler/*.o xbmc/lib/libPython/*.o xbmc/lib/libPython/xbmcmodule/*.o xbmc/xbox/*.o xbmc/cores/DllLoader/*.o xbmc/cores/DllLoader/exports/*.o xbmc/cores/DllLoader/exports/util/*.o xbmc/utils/*.o xbmc/lib/UnrarXLib/*.o xbmc/lib/libGoAhead/*.o xbmc/cores/dvdplayer/*.o xbmc/cores/dvdplayer/DVDSubtitles/*.o xbmc/cores/dvdplayer/DVDInputStreams/*.o xbmc/cores/dvdplayer/DVDCodecs/*.o xbmc/cores/dvdplayer/DVDCodecs/Audio/*.o xbmc/cores/dvdplayer/DVDCodecs/Video/*.o xbmc/cores/dvdplayer/DVDCodecs/Overlay/*.o xbmc/cores/dvdplayer/DVDDemuxers/*.o xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc/*.o xbmc/cores/VideoRenderers/*.o xbmc/cores/VideoRenderers/VideoShaders/*.o xbmc/cdrip/*.o xbmc/lib/libcmyth/*.o xbmc/lib/libRTMP/*.o) xbmc/lib/libXBMS/libxbms-@... xbmc/lib/libUPnP/libupnp-@... 
 	g++ $(DEBUG_FLAGS) -o xbmc.bin xbmc/*.o xbmc/settings/*.o xbmc/cdrip/*.o guilib/*.o guilib/tinyXML/*.o guilib/common/*.o xbmc/FileSystem/*.o xbmc/FileSystem/VideoDatabaseDirectory/*.o xbmc/FileSystem/MusicDatabaseDirectory/*.o xbmc/visualizations/*.o xbmc/screensavers/*.o xbmc/cores/*.o xbmc/cores/paplayer/*.o xbmc/linux/*.o xbmc/lib/sqLite/*.o xbmc/lib/libscrobbler/*.o xbmc/lib/libPython/*.o xbmc/lib/libPython/xbmcmodule/*.o xbmc/xbox/*.o xbmc/cores/DllLoader/*.o xbmc/cores/DllLoader/exports/*.o xbmc/cores/DllLoader/exports/util/*.o xbmc/utils/*.o xbmc/lib/UnrarXLib/*.o xbmc/lib/libGoAhead/*.o xbmc/cores/dvdplayer/*.o xbmc/cores/dvdplayer/DVDSubtitles/*.o xbmc/cores/dvdplayer/DVDInputStreams/*.o xbmc/cores/dvdplayer/DVDCodecs/*.o xbmc/cores/dvdplayer/DVDCodecs/Audio/*.o xbmc/cores/dvdplayer/DVDCodecs/Video/*.o xbmc/cores/dvdplayer/DVDCodecs/Overlay/*.o xbmc/cores/dvdplayer/DVDDemuxers/*.o xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc/*.o xbmc/cores/VideoRenderers/*.o xbmc/cores/VideoRenderers/VideoShaders/*.o xbmc/lib/libcmyth/*.o xbmc/lib/libRTMP/*.o xbmc/lib/libGoAhead/libGoAheadD-@... xbmc/lib/libXBMS/libxbms-@... xbmc/lib/libUPnP/libupnp-@... xbmc/lib/libshout/libshout-@... xbmc/lib/libRTV/librtv-@... xbmc/lib/libXDAAP/libxdaap-@... xbmc/lib/libcdio/libcdio-@... xbmc/lib/libsmb/libsmbclient-@... $(LIBS) -rdynamic

Deleted: branches/linuxport/XBMC/system/libexif-i486-linux.so
===================================================================
(Binary files differ)

Copied: branches/linuxport/XBMC/xbmc/lib/libexif/ExifParse.cpp (from rev 14129, branches/linuxport/sources/libexif/ExifParse.cpp)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libexif/ExifParse.cpp	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libexif/ExifParse.cpp	2008-07-15 21:38:33 UTC (rev 14132)
@@ -0,0 +1,894 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+//--------------------------------------------------------------------------
+// Program to pull the EXIF information out of various types of digital
+// images and present it in a reasonably consistent way
+//
+// Original code pulled from 'jhead' by Matthias Wandel (http://www.sentex.net/~mwandel/) - jhead
+// Adapted for XBMC by DD.
+//--------------------------------------------------------------------------
+
+// Note: Jhead supports TAG_MAKER_NOTE exif field,
+//       but that is ommited for now - to make porting easier and addition smaller
+#ifndef _LINUX
+#include <windows.h>
+#else
+#include <memory.h>
+#define min(a,b) (a)>(b)?(b):(a)
+#define max(a,b) (a)<(b)?(b):(a)
+#endif
+#include <math.h>
+#include <stdio.h>
+#include "ExifParse.h"
+
+
+// Prototypes for exif utility functions.
+static void ErrNonfatal(const void* const msg, int a1, int a2);
+
+#define DIR_ENTRY_ADDR(Start, Entry) ((Start)+2+12*(Entry))
+
+
+//--------------------------------------------------------------------------
+// Describes tag values
+#define TAG_DESCRIPTION        0x010E
+#define TAG_MAKE               0x010F
+#define TAG_MODEL              0x0110
+#define TAG_ORIENTATION        0x0112
+#define TAG_X_RESOLUTION       0x011A           // Not processed. Format rational64u (see http://search.cpan.org/src/EXIFTOOL/Image-ExifTool-6.76/html/TagNames/EXIF.html)
+#define TAG_Y_RESOLUTION       0x011B           // Not processed. Format rational64u
+#define TAG_RESOLUTION_UNIT    0x0128           // Not processed. Format int16u. Values: 1-none; 2-inches; 3-cm
+#define TAG_SOFTWARE           0x0131
+#define TAG_DATETIME           0x0132
+#define TAG_THUMBNAIL_OFFSET   0x0201
+#define TAG_THUMBNAIL_LENGTH   0x0202
+#define TAG_Y_CB_CR_POS        0x0213           // Not processed. Format int16u. Values: 1-Centered; 2-Co-sited
+#define TAG_EXPOSURETIME       0x829A
+#define TAG_FNUMBER            0x829D
+#define TAG_EXIF_OFFSET        0x8769
+#define TAG_EXPOSURE_PROGRAM   0x8822
+#define TAG_GPSINFO            0x8825
+#define TAG_ISO_EQUIVALENT     0x8827
+#define TAG_EXIF_VERSION       0x9000           // Not processed.
+#define TAG_COMPONENT_CFG      0x9101           // Not processed.
+#define TAG_DATETIME_ORIGINAL  0x9003
+#define TAG_DATETIME_DIGITIZED 0x9004
+#define TAG_SHUTTERSPEED       0x9201
+#define TAG_APERTURE           0x9202
+#define TAG_EXPOSURE_BIAS      0x9204
+#define TAG_MAXAPERTURE        0x9205
+#define TAG_SUBJECT_DISTANCE   0x9206
+#define TAG_METERING_MODE      0x9207
+#define TAG_LIGHT_SOURCE       0x9208
+#define TAG_FLASH              0x9209
+#define TAG_FOCALLENGTH        0x920A
+#define TAG_MAKER_NOTE         0x927C           // Not processed yet. Maybe in the future.
+#define TAG_USERCOMMENT        0x9286
+#define TAG_FLASHPIX_VERSION   0xA000           // Not processed.
+#define TAG_COLOUR_SPACE       0xA001           // Not processed. Format int16u. Values: 1-RGB; 2-Adobe RGB 65535-Uncalibrated
+#define TAG_EXIF_IMAGEWIDTH    0xa002
+#define TAG_EXIF_IMAGELENGTH   0xa003
+#define TAG_INTEROP_OFFSET     0xa005
+#define TAG_FOCALPLANEXRES     0xa20E
+#define TAG_FOCALPLANEUNITS    0xa210
+#define TAG_EXPOSURE_INDEX     0xa215
+#define TAG_EXPOSURE_MODE      0xa402
+#define TAG_WHITEBALANCE       0xa403
+#define TAG_DIGITALZOOMRATIO   0xA404
+#define TAG_FOCALLENGTH_35MM   0xa405
+
+#define TAG_GPS_LAT_REF        1
+#define TAG_GPS_LAT            2
+#define TAG_GPS_LONG_REF       3
+#define TAG_GPS_LONG           4
+#define TAG_GPS_ALT_REF        5
+#define TAG_GPS_ALT            6
+
+//--------------------------------------------------------------------------
+// Exif format descriptor stuff
+#define FMT_BYTE       1
+#define FMT_STRING     2
+#define FMT_USHORT     3
+#define FMT_ULONG      4
+#define FMT_URATIONAL  5
+#define FMT_SBYTE      6
+#define FMT_UNDEFINED  7
+#define FMT_SSHORT     8
+#define FMT_SLONG      9
+#define FMT_SRATIONAL 10
+#define FMT_SINGLE    11
+#define FMT_DOUBLE    12
+// NOTE: Remember to change NUM_FORMATS if you define a new format
+#define NUM_FORMATS   12
+
+//--------------------------------------------------------------------------
+// Internationalisation string IDs. The enum order must match that in the
+// language file (e.g. 'language/English/strings.xml', and EXIF_PARSE_STRING_ID_BASE
+// must match the ID of the first Exif string in that file.
+#define EXIF_PARSE_STRING_ID_BASE       21800
+enum {
+// Distance
+  ExifStrDistanceInfinite = EXIF_PARSE_STRING_ID_BASE,
+// Whitebalance et.al.
+  ExifStrManual,
+  ExifStrAuto,
+// Flash modes
+  ExifStrYes,
+  ExifStrNo,
+  ExifStrFlashNoStrobe,
+  ExifStrFlashStrobe,
+  ExifStrFlashManual,
+  ExifStrFlashManualNoReturn,
+  ExifStrFlashManualReturn,
+  ExifStrFlashAuto,
+  ExifStrFlashAutoNoReturn,
+  ExifStrFlashAutoReturn,
+  ExifStrFlashRedEye,
+  ExifStrFlashRedEyeNoReturn,
+  ExifStrFlashRedEyeReturn,
+  ExifStrFlashManualRedEye,
+  ExifStrFlashManualRedEyeNoReturn,
+  ExifStrFlashManualRedEyeReturn,
+  ExifStrFlashAutoRedEye,
+  ExifStrFlashAutoRedEyeNoReturn,
+  ExifStrFlashAutoRedEyeReturn,
+// Light sources
+  ExifStrDaylight,
+  ExifStrFluorescent,
+  ExifStrIncandescent,
+  ExifStrFlash,
+  ExifStrFineWeather,
+  ExifStrShade,
+// Metering Mode
+  ExifStrMeteringCenter,
+  ExifStrMeteringSpot,
+  ExifStrMeteringMatrix,
+// Exposure Program
+  ExifStrExposureProgram,
+  ExifStrExposureAperture,
+  ExifStrExposureShutter,
+  ExifStrExposureCreative,
+  ExifStrExposureAction,
+  ExifStrExposurePortrait,
+  ExifStrExposureLandscape,
+// Exposure mode
+  ExifStrExposureModeAuto,
+// ISO equivalent
+  ExifStrIsoEquivalent,
+// GPS latitude, longitude, altitude
+  ExifStrGpsLatitude,
+  ExifStrGpsLongitude,
+  ExifStrGpsAltitude,
+} E_ExifParseStringId;
+
+
+
+
+//--------------------------------------------------------------------------
+// Report non fatal errors.  Now that microsoft.net modifies exif headers,
+// there's corrupted ones, and there could be more in the future.
+//--------------------------------------------------------------------------
+static void ErrNonfatal(const char* const msg, int a1, int a2)
+{
+  printf("ExifParse - Nonfatal Error : %s %d %d", msg, a1, a2);
+}
+
+//--------------------------------------------------------------------------
+// Constructor.
+//--------------------------------------------------------------------------
+CExifParse::CExifParse () : m_FocalPlaneXRes(0.0),
+        m_FocalPlaneUnits(0.0), m_ExifImageWidth(0), m_MotorolaOrder(false),
+        m_DateFound(false)
+{
+  m_ExifInfo = NULL;
+}
+
+//--------------------------------------------------------------------------
+// Convert a 16 bit unsigned value from file's native byte order
+//--------------------------------------------------------------------------
+int CExifParse::Get16(const void* const Short, const bool motorolaOrder)
+{
+    int retVal = *(unsigned short*)Short;
+    if (motorolaOrder) {
+        retVal = ((retVal & 0x00FF) << 8) |
+                 ((retVal & 0xFF00) >> 8);
+    }
+    return retVal;
+}
+
+//--------------------------------------------------------------------------
+// Convert a 32 bit signed value from file's native byte order
+//--------------------------------------------------------------------------
+int CExifParse::Get32(const void* const Long, const bool motorolaOrder)
+{
+    int retVal = *(unsigned long*)Long;
+    if (motorolaOrder) {
+        retVal = ((retVal & 0x000000FF) << 24) |
+                 ((retVal & 0x0000FF00) << 8)  |
+                 ((retVal & 0x00FF0000) >> 8)  |
+                 ((retVal & 0xFF000000) >> 24);
+    }
+    return retVal;
+}
+
+//--------------------------------------------------------------------------
+// It appears that CStdString constructor replaces "\n" with "\r\n" which results
+// in "\r\r\n" if there already is "\r\n", which in turn results in corrupted
+// display. So this is an attempt to undo effects of a smart constructor. Also,
+// replaces all nonprintable characters with "."
+//--------------------------------------------------------------------------
+/*void CExifParse::FixComment(CStdString& comment)
+{
+  comment.Replace("\r\r\n", "\r\n");
+  for (unsigned int i=0; i<comment.length(); i++)
+  {
+    if ((comment[i] < 32) && (comment[i] != '\n') && (comment[i] != '\t') && (comment[i] != '\r'))
+    {
+      comment[i] = '.';
+    }
+  }
+}*/
+
+//--------------------------------------------------------------------------
+// Evaluate number, be it int, rational, or float from directory.
+//--------------------------------------------------------------------------
+double CExifParse::ConvertAnyFormat(const void* const ValuePtr, int Format)
+{
+  double Value;
+  Value = 0;
+
+  switch(Format)
+  {
+    case FMT_SBYTE:     Value = *(  signed char*)ValuePtr;          break;
+    case FMT_BYTE:      Value = *(unsigned char*)ValuePtr;          break;
+
+    case FMT_USHORT:    Value = Get16(ValuePtr, m_MotorolaOrder);   break;
+    case FMT_ULONG:     Value = Get32(ValuePtr, m_MotorolaOrder);   break;
+
+    case FMT_URATIONAL:
+    case FMT_SRATIONAL:
+    {
+      int Num,Den;
+      Num = Get32(ValuePtr, m_MotorolaOrder);
+      Den = Get32(4+(char *)ValuePtr, m_MotorolaOrder);
+
+      if (Den == 0)    Value = 0;
+      else             Value = (double)Num/Den;
+    }
+    break;
+
+    case FMT_SSHORT:    Value = (signed short)Get16(ValuePtr, m_MotorolaOrder);    break;
+    case FMT_SLONG:     Value = Get32(ValuePtr, m_MotorolaOrder);                  break;
+
+    // Not sure if this is correct (never seen float used in Exif format)
+    case FMT_SINGLE:    Value = (double)*(float*)ValuePtr;          break;
+    case FMT_DOUBLE:    Value = *(double*)ValuePtr;                 break;
+
+    default:
+      ErrNonfatal("Illegal format code %d",Format,0);
+  }
+  return Value;
+}
+
+//--------------------------------------------------------------------------
+// Exif date tag is stored as a fixed format string "YYYY:MM:DD HH:MM:SS".
+// If date is not set, then the string is filled with blanks and colons:
+// "    :  :     :  :  ". We want this string localised.
+//--------------------------------------------------------------------------
+/*void CExifParse::LocaliseDate (void)
+{
+    if (m_ExifInfo[SLIDE_EXIF_DATE_TIME][0] != ' ')
+    {
+        int year  = atoi(m_ExifInfo[SLIDE_EXIF_DATE_TIME].substr(0, 4).c_str());
+        int month = atoi(m_ExifInfo[SLIDE_EXIF_DATE_TIME].substr(5, 2).c_str());
+        int day   = atoi(m_ExifInfo[SLIDE_EXIF_DATE_TIME].substr(8, 2).c_str());
+        int hour  = atoi(m_ExifInfo[SLIDE_EXIF_DATE_TIME].substr(11,2).c_str());
+        int min   = atoi(m_ExifInfo[SLIDE_EXIF_DATE_TIME].substr(14,2).c_str());
+        int sec   = atoi(m_ExifInfo[SLIDE_EXIF_DATE_TIME].substr(17,2).c_str());
+        CDateTime date(year, month, day, hour, min, sec);
+        m_ExifInfo[SLIDE_EXIF_DATE_TIME] = date.GetAsLocalizedDateTime();
+    }
+}*/
+
+
+//--------------------------------------------------------------------------
+// Convert exposure time into a human readable format
+//--------------------------------------------------------------------------
+/*void CExifParse::GetExposureTime(const float exposureTime, CStdString& outStr)
+{
+  if (exposureTime)
+  {
+    if (exposureTime < 0.010)   outStr.Format("%6.4fs ", exposureTime);
+    else                        outStr.Format("%5.3fs ", exposureTime);
+    if (exposureTime <= 0.5)    outStr.Format("%s (1/%d)", outStr, (int)(0.5 + 1/exposureTime));
+  }
+}*/
+
+//--------------------------------------------------------------------------
+// Process one of the nested EXIF directories.
+//--------------------------------------------------------------------------
+void CExifParse::ProcessDir(const unsigned char* const DirStart,
+                            const unsigned char* const OffsetBase,
+                            const unsigned ExifLength,
+                            int NestingLevel)
+{
+  if (NestingLevel > 4)
+  {
+    ErrNonfatal("Maximum directory nesting exceeded (corrupt exif header)", 0,0);
+    return;
+  }
+
+  char IndentString[25];
+  memset(IndentString, ' ', 25);
+  IndentString[NestingLevel * 4] = '\0';
+
+
+  int NumDirEntries = Get16((void*)DirStart, m_MotorolaOrder);
+
+  const unsigned char* const DirEnd = DIR_ENTRY_ADDR(DirStart, NumDirEntries);
+  if (DirEnd+4 > (OffsetBase+ExifLength))
+  {
+    if (DirEnd+2 == OffsetBase+ExifLength || DirEnd == OffsetBase+ExifLength)
+    {
+      // Version 1.3 of jhead would truncate a bit too much.
+      // This also caught later on as well.
+    }
+    else
+    {
+      ErrNonfatal("Illegally sized directory", 0,0);
+      return;
+    }
+  }
+
+  int     flashUsed       = -1;
+  int     isoEquivalent   = 0;
+  float   exposureTime    = 0.0;
+  float   apertureFNumber = 0.0;
+  const int BytesPerFormat[] = {0,1,1,2,4,8,1,1,2,4,8,4,8};
+
+
+  for (int de=0;de<NumDirEntries;de++)
+  {
+    int Tag, Format, Components;
+    unsigned char* ValuePtr;
+    int ByteCount;
+    const unsigned char* const DirEntry = DIR_ENTRY_ADDR(DirStart, de);
+
+    Tag = Get16(DirEntry, m_MotorolaOrder);
+    Format = Get16(DirEntry+2, m_MotorolaOrder);
+    Components = Get32(DirEntry+4, m_MotorolaOrder);
+
+    if ((Format-1) >= NUM_FORMATS)
+    {
+      // (-1) catches illegal zero case as unsigned underflows to positive large.
+      ErrNonfatal("Illegal number format %d for tag %04x", Format, Tag);
+      continue;
+    }
+
+    if ((unsigned)Components > 0x10000)
+    {
+      ErrNonfatal("Illegal number of components %d for tag %04x", Components, Tag);
+      continue;
+    }
+
+    ByteCount = Components * BytesPerFormat[Format];
+
+    if (ByteCount > 4)
+    {
+      unsigned OffsetVal;
+      OffsetVal = Get32(DirEntry+8, m_MotorolaOrder);
+      // If its bigger than 4 bytes, the dir entry contains an offset.
+      if (OffsetVal+ByteCount > ExifLength)
+      {
+        // Bogus pointer offset and / or bytecount value
+        ErrNonfatal("Illegal value pointer for tag %04x", Tag,0);
+        continue;
+      }
+      ValuePtr = (unsigned char*)(OffsetBase+OffsetVal);
+
+      if (OffsetVal > m_LargestExifOffset)
+      {
+        m_LargestExifOffset = OffsetVal;
+      }
+
+    }
+    else {
+      // 4 bytes or less and value is in the dir entry itself
+      ValuePtr = (unsigned char*)(DirEntry+8);
+    }
+
+
+    // Extract useful components of tag
+    switch(Tag)
+    {
+//      case TAG_DESCRIPTION:       strncpy(m_ExifInfo->Description, ValuePtr, 5);    break;
+      case TAG_MAKE:              strncpy(m_ExifInfo->CameraMake, (char *)ValuePtr, 32);    break;
+      case TAG_MODEL:             strncpy(m_ExifInfo->CameraModel, (char *)ValuePtr, 40);    break;
+//      case TAG_SOFTWARE:          strncpy(m_ExifInfo->Software, ValuePtr, 5);    break;
+      case TAG_FOCALPLANEXRES:    m_FocalPlaneXRes  = ConvertAnyFormat(ValuePtr, Format);               break;
+      case TAG_THUMBNAIL_OFFSET:  m_ExifInfo->ThumbnailOffset = (unsigned)ConvertAnyFormat(ValuePtr, Format);     break;
+      case TAG_THUMBNAIL_LENGTH:  m_ExifInfo->ThumbnailSize   = (unsigned)ConvertAnyFormat(ValuePtr, Format);     break;
+
+      case TAG_MAKER_NOTE:
+        continue;
+      break;
+
+      case TAG_DATETIME_ORIGINAL:
+        // If we get a DATETIME_ORIGINAL, we use that one.
+        strncpy(m_ExifInfo->DateTime, (char *)ValuePtr, 20);
+        m_DateFound = true;
+      break;
+
+      case TAG_DATETIME_DIGITIZED:
+      case TAG_DATETIME:
+        if (m_DateFound == false)
+        {
+          // If we don't already have a DATETIME_ORIGINAL, use whatever
+          // time fields we may have.
+          strncpy(m_ExifInfo->DateTime, (char *)ValuePtr, 20);
+//          LocaliseDate();
+        }
+      break;
+
+      case TAG_USERCOMMENT:
+      {
+        const int EXIF_COMMENT_HDR_LENGTH = 8;        // All comment tags have 8 bytes of header info
+        int length = max(ByteCount - EXIF_COMMENT_HDR_LENGTH, 0);
+        length = min(length, 2000);
+        strncpy(m_ExifInfo->Comments, (char *)ValuePtr+EXIF_COMMENT_HDR_LENGTH, length);
+//        FixComment(comment);                          // Ensure comment is printable
+      }
+      break;
+
+      case TAG_FNUMBER:
+        // Simplest way of expressing aperture, so I trust it the most.
+        // (overwrite previously computd value if there is one)
+        m_ExifInfo->ApertureFNumber = (float)ConvertAnyFormat(ValuePtr, Format);
+      break;
+
+      case TAG_APERTURE:
+      case TAG_MAXAPERTURE:
+        // More relevant info always comes earlier, so only use this field if we don't
+        // have appropriate aperture information yet.
+        if (m_ExifInfo->ApertureFNumber == 0)
+        {
+          m_ExifInfo->ApertureFNumber = (float)exp(ConvertAnyFormat(ValuePtr, Format)*log(2.0)*0.5);
+        }
+      break;
+
+      case TAG_FOCALLENGTH:
+        // Nice digital cameras actually save the focal length as a function
+        // of how far they are zoomed in.
+        m_ExifInfo->FocalLength = (float)ConvertAnyFormat(ValuePtr, Format);
+      break;
+
+      case TAG_SUBJECT_DISTANCE:
+        // Inidcates the distacne the autofocus camera is focused to.
+        // Tends to be less accurate as distance increases.
+        {
+          float distance = (float)ConvertAnyFormat(ValuePtr, Format);
+          if (distance < 0)
+            m_ExifInfo->Distance = distance; // infinite
+          else             
+            m_ExifInfo->Distance = distance;
+        }
+      break;
+
+      case TAG_EXPOSURETIME:
+        {
+        // Simplest way of expressing exposure time, so I trust it most.
+        // (overwrite previously computd value if there is one)
+        float expTime = (float)ConvertAnyFormat(ValuePtr, Format);
+        if (expTime)
+          m_ExifInfo->ExposureTime = expTime;
+        }
+      break;
+
+      case TAG_SHUTTERSPEED:
+        // More complicated way of expressing exposure time, so only use
+        // this value if we don't already have it from somewhere else.
+        if (m_ExifInfo->ExposureTime == 0)
+        {
+          m_ExifInfo->ExposureTime = (float)(1/exp(ConvertAnyFormat(ValuePtr, Format)*log(2.0)));
+        }
+      break;
+
+      case TAG_FLASH:
+        m_ExifInfo->FlashUsed = (int)ConvertAnyFormat(ValuePtr, Format);
+      break;
+
+      case TAG_ORIENTATION:
+        m_ExifInfo->Orientation = (int)ConvertAnyFormat(ValuePtr, Format);
+        if (m_ExifInfo->Orientation < 0 || m_ExifInfo->Orientation > 8)
+        {
+          ErrNonfatal("Undefined rotation value %d", m_ExifInfo->Orientation, 0);
+          m_ExifInfo->Orientation = 0;
+        }
+      break;
+
+      case TAG_EXIF_IMAGELENGTH:
+      case TAG_EXIF_IMAGEWIDTH:
+        // Use largest of height and width to deal with images that have been
+        // rotated to portrait format.
+        {
+          int a = (int)ConvertAnyFormat(ValuePtr, Format);
+          if (m_ExifImageWidth < a) m_ExifImageWidth = a;
+        }
+      break;
+
+      case TAG_FOCALPLANEUNITS:
+        switch((int)ConvertAnyFormat(ValuePtr, Format))
+        {
+          // According to the information I was using, 2 means meters.
+          // But looking at the Cannon powershot's files, inches is the only
+          // sensible value.
+          case 1: m_FocalPlaneUnits = 25.4; break;  // inch
+          case 2: m_FocalPlaneUnits = 25.4; break;
+          case 3: m_FocalPlaneUnits = 10;   break;  // centimeter
+          case 4: m_FocalPlaneUnits = 1;    break;  // millimeter
+          case 5: m_FocalPlaneUnits = .001; break;  // micrometer
+        }
+      break;
+
+      case TAG_EXPOSURE_BIAS:
+        m_ExifInfo->ExposureBias = (float)ConvertAnyFormat(ValuePtr, Format);
+      break;
+
+      case TAG_WHITEBALANCE:
+        m_ExifInfo->Whitebalance = (int)ConvertAnyFormat(ValuePtr, Format);
+      break;
+
+      case TAG_LIGHT_SOURCE:
+        //Quercus: 17-1-2004 Added LightSource, some cams return this, whitebalance or both
+        m_ExifInfo->LightSource = (int)ConvertAnyFormat(ValuePtr, Format);
+      break;
+
+      case TAG_METERING_MODE:
+        m_ExifInfo->MeteringMode = (int)ConvertAnyFormat(ValuePtr, Format);
+      break;
+
+      case TAG_EXPOSURE_PROGRAM:
+        m_ExifInfo->ExposureProgram = (int)ConvertAnyFormat(ValuePtr, Format);
+      break;
+
+      case TAG_EXPOSURE_INDEX:
+        if (m_ExifInfo->ISOequivalent == 0)
+        {
+          // Exposure index and ISO equivalent are often used interchangeably,
+          // so we will do the same.
+          // http://photography.about.com/library/glossary/bldef_ei.htm
+          m_ExifInfo->ISOequivalent = (int)ConvertAnyFormat(ValuePtr, Format);
+        }
+      break;
+
+      case TAG_ISO_EQUIVALENT:
+        m_ExifInfo->ISOequivalent = (int)ConvertAnyFormat(ValuePtr, Format);
+        if (m_ExifInfo->ISOequivalent < 50)
+          m_ExifInfo->ISOequivalent *= 200;          // Fixes strange encoding on some older digicams.
+      break;
+
+      case TAG_EXPOSURE_MODE:
+        m_ExifInfo->ExposureMode = (int)ConvertAnyFormat(ValuePtr, Format);
+      break;
+
+      case TAG_DIGITALZOOMRATIO:
+        m_ExifInfo->DigitalZoomRatio = (float)ConvertAnyFormat(ValuePtr, Format);
+      break;
+
+      case TAG_EXIF_OFFSET:
+      case TAG_INTEROP_OFFSET:
+      {
+        const unsigned char* const SubdirStart = OffsetBase + Get32(ValuePtr, m_MotorolaOrder);
+        if (SubdirStart < OffsetBase || SubdirStart > OffsetBase+ExifLength)
+        {
+          ErrNonfatal("Illegal exif or interop ofset directory link",0,0);
+        }
+        else
+        {
+          ProcessDir(SubdirStart, OffsetBase, ExifLength, NestingLevel+1);
+        }
+        continue;
+      }
+      break;
+
+      case TAG_GPSINFO:
+      {
+        const unsigned char* const SubdirStart = OffsetBase + Get32(ValuePtr, m_MotorolaOrder);
+        if (SubdirStart < OffsetBase || SubdirStart > OffsetBase+ExifLength)
+        {
+          ErrNonfatal("Illegal GPS directory link",0,0);
+        }
+        else
+        {
+          ProcessGpsInfo(SubdirStart, ByteCount, OffsetBase, ExifLength);
+        }
+        continue;
+      }
+      break;
+
+      case TAG_FOCALLENGTH_35MM:
+        // The focal length equivalent 35 mm is a 2.2 tag (defined as of April 2002)
+        // if its present, use it to compute equivalent focal length instead of
+        // computing it from sensor geometry and actual focal length.
+        m_ExifInfo->FocalLength35mmEquiv = (unsigned)ConvertAnyFormat(ValuePtr, Format);
+      break;
+    }
+  }
+
+
+  // In addition to linking to subdirectories via exif tags,
+  // there's also a potential link to another directory at the end of each
+  // directory.  this has got to be the result of a committee!
+  unsigned Offset;
+
+  if (DIR_ENTRY_ADDR(DirStart, NumDirEntries) + 4 <= OffsetBase+ExifLength)
+  {
+    Offset = Get32(DirStart+2+12*NumDirEntries, m_MotorolaOrder);
+    if (Offset)
+    {
+      const unsigned char* const SubdirStart = OffsetBase + Offset;
+      if (SubdirStart > OffsetBase+ExifLength || SubdirStart < OffsetBase)
+      {
+        if (SubdirStart > OffsetBase && SubdirStart < OffsetBase+ExifLength+20)
+        {
+          // Jhead 1.3 or earlier would crop the whole directory!
+          // As Jhead produces this form of format incorrectness,
+          // I'll just let it pass silently
+        }
+        else
+        {
+          ErrNonfatal("Illegal subdirectory link",0,0);
+        }
+      }
+      else
+      {
+        if (SubdirStart <= OffsetBase+ExifLength)
+        {
+          ProcessDir(SubdirStart, OffsetBase, ExifLength, NestingLevel+1);
+        }
+      }
+      if (Offset > m_LargestExifOffset)
+      {
+        m_LargestExifOffset = Offset;
+      }
+    }
+  }
+  else
+  {
+    // The exif header ends before the last next directory pointer.
+  }
+
+  if (m_ExifInfo->ThumbnailOffset)
+  {
+    m_ExifInfo->ThumbnailAtEnd = false;
+
+    if (m_ExifInfo->ThumbnailOffset <= ExifLength)
+    {
+      if (m_ExifInfo->ThumbnailSize > ExifLength - m_ExifInfo->ThumbnailOffset)
+      {
+        // If thumbnail extends past exif header, only save the part that
+        // actually exists.  Canon's EOS viewer utility will do this - the
+        // thumbnail extracts ok with this hack.
+        m_ExifInfo->ThumbnailSize = ExifLength - m_ExifInfo->ThumbnailOffset;
+      }
+    }
+  }
+}
+
+
+//--------------------------------------------------------------------------
+// Process a EXIF marker
+// Describes all the drivel that most digital cameras include...
+//--------------------------------------------------------------------------
+bool CExifParse::Process (const unsigned char* const ExifSection, const unsigned short length, ExifInfo_t *info)
+{
+  m_ExifInfo = info;
+  // EXIF signature: "Exif\0\0"
+  // Check EXIF signatures
+  const char ExifHeader[]     = "Exif\0\0";
+  const char ExifAlignment0[] = "II";
+  const char ExifAlignment1[] = "MM";
+  const char ExifExtra        = 0x2a;
+
+  char* pos = (char*)(ExifSection + sizeof(short));   // position data pointer after length field
+
+  if (memcmp(pos, ExifHeader,6))
+  {
+    printf("ExifParse: incorrect Exif header");
+    return false;
+  }
+  pos += 6;
+
+  if (memcmp(pos, ExifAlignment0, strlen(ExifAlignment0)) == 0)
+  {
+    m_MotorolaOrder = false;
+  }
+  else if (memcmp(pos, ExifAlignment1, strlen(ExifAlignment1)) == 0)
+  {
+    m_MotorolaOrder = true;
+  }
+  else
+  {
+    printf("ExifParse: invalid Exif alignment marker");
+    return false;
+  }
+  pos += strlen(ExifAlignment0);
+
+  // Check the next value for correctness.
+  if (Get16((void*)(pos), m_MotorolaOrder) != ExifExtra)
+  {
+    printf("ExifParse: invalid Exif start (1)");
+    return false;
+  }
+  pos += sizeof(short);
+
+  unsigned long FirstOffset = Get32((void*)pos, m_MotorolaOrder);
+  if (FirstOffset < 8 || FirstOffset > 16)
+  {
+    // Usually set to 8, but other values valid too.
+//  CLog::Log(LOGERROR, "ExifParse: suspicious offset of first IFD value");
+  }
+
+
+
+  // First directory starts 16 bytes in.  All offset are relative to 8 bytes in.
+  ProcessDir(ExifSection+8+FirstOffset, ExifSection+8, length-8, 0);
+
+  m_ExifInfo->ThumbnailAtEnd = m_ExifInfo->ThumbnailOffset >= m_LargestExifOffset ? true : false;
+
+  // Compute the CCD width, in millimeters.
+  if (m_FocalPlaneXRes != 0)
+  {
+    // Note: With some cameras, its not possible to compute this correctly because
+    // they don't adjust the indicated focal plane resolution units when using less
+    // than maximum resolution, so the CCDWidth value comes out too small.  Nothing
+    // that Jhead can do about it - its a camera problem.
+    m_ExifInfo->CCDWidth = (float)(m_ExifImageWidth * m_FocalPlaneUnits / m_FocalPlaneXRes);
+  }
+
+  if (m_ExifInfo->FocalLength)
+  {
+    if (m_ExifInfo->FocalLength35mmEquiv == 0)
+    {
+      // Compute 35 mm equivalent focal length based on sensor geometry if we haven't
+      // already got it explicitly from a tag.
+      if (m_ExifInfo->CCDWidth != 0.0)
+      {
+        m_ExifInfo->FocalLength35mmEquiv = (int)(m_ExifInfo->FocalLength/m_ExifInfo->CCDWidth*36 + 0.5);
+      }
+    }
+  }
+  return true;
+}
+
+
+
+//--------------------------------------------------------------------------
+// GPS Lat/Long extraction helper function
+//--------------------------------------------------------------------------
+void CExifParse::GetLatLong(
+        const unsigned int Format,
+        const unsigned char* ValuePtr,
+        const int ComponentSize,
+        char *latLongString)
+{
+  if (Format != FMT_URATIONAL)
+  {
+    ErrNonfatal("Illegal number format %d for GPS Lat/Long", Format, 0);
+  }
+  else
+  {
+    double Values[3];
+    for (unsigned a=0; a<3 ;a++)
+    {
+      Values[a] = ConvertAnyFormat(ValuePtr+a*ComponentSize, Format);
+    }
+    char latLong[30];
+    sprintf(latLong, "%3.0fd %2.0f' %5.2f\"", Values[0], Values[1], Values[2]);
+    strcat(latLongString, latLong);
+  }
+}
+
+//--------------------------------------------------------------------------
+// Process GPS info directory
+//--------------------------------------------------------------------------
+void CExifParse::ProcessGpsInfo(
+                    const unsigned char* const DirStart,
+                    int ByteCountUnused,
+                    const unsigned char* const OffsetBase,
+                    unsigned ExifLength)
+{
+  int NumDirEntries = Get16(DirStart);
+
+  for (int de=0;de<NumDirEntries;de++)
+  {
+    const unsigned char* DirEntry = DIR_ENTRY_ADDR(DirStart, de);
+
+    unsigned Tag        = Get16(DirEntry);
+    unsigned Format     = Get16(DirEntry+2);
+    unsigned Components = Get32(DirEntry+4);
+    if ((Format-1) >= NUM_FORMATS)
+    {
+      // (-1) catches illegal zero case as unsigned underflows to positive large.
+      ErrNonfatal("Illegal number format %d for tag %04x", Format, Tag);
+      continue;
+    }
+
+    const int BytesPerFormat[] = {0,1,1,2,4,8,1,1,2,4,8,4,8};
+    int ComponentSize  = BytesPerFormat[Format];
+    unsigned ByteCount = Components * ComponentSize;
+
+    const unsigned char* ValuePtr;
+
+    if (ByteCount > 4)
+    {
+      unsigned OffsetVal = Get32(DirEntry+8);
+      // If its bigger than 4 bytes, the dir entry contains an offset.
+      if (OffsetVal+ByteCount > ExifLength)
+      {
+        // Bogus pointer offset and / or bytecount value
+        ErrNonfatal("Illegal value pointer for tag %04x", Tag,0);
+        continue;
+      }
+      ValuePtr = OffsetBase+OffsetVal;
+    }
+    else
+    {
+      // 4 bytes or less and value is in the dir entry itself
+      ValuePtr = DirEntry+8;
+    }
+
+    switch(Tag)
+    {
+      case TAG_GPS_LAT_REF:
+        m_ExifInfo->GpsLat[0] = ValuePtr[0];
+        m_ExifInfo->GpsLat[1] = 0;
+      break;
+
+      case TAG_GPS_LONG_REF:
+        m_ExifInfo->GpsLong[0] = ValuePtr[0];
+        m_ExifInfo->GpsLong[1] = 0;
+      break;
+
+      case TAG_GPS_LAT:
+        GetLatLong(Format, ValuePtr, ComponentSize, m_ExifInfo->GpsLat);
+      break;
+      case TAG_GPS_LONG:
+        GetLatLong(Format, ValuePtr, ComponentSize, m_ExifInfo->GpsLong);
+      break;
+
+      case TAG_GPS_ALT_REF:
+        if (ValuePtr[0] != 0)
+          m_ExifInfo->GpsAlt[0] = '-';
+        m_ExifInfo->GpsAlt[1] = 0;
+      break;
+
+      case TAG_GPS_ALT:
+        {
+          char temp[18];
+          sprintf(temp,"%dm", Get32(ValuePtr));
+          strcat(m_ExifInfo->GpsAlt, temp);
+        }
+      break;
+    }
+  }
+}
+

Copied: branches/linuxport/XBMC/xbmc/lib/libexif/ExifParse.h (from rev 14129, branches/linuxport/sources/libexif/ExifParse.h)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libexif/ExifParse.h	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libexif/ExifParse.h	2008-07-15 21:38:33 UTC (rev 14132)
@@ -0,0 +1,38 @@
+#pragma once
+
+#include "libexif.h"
+
+class CExifParse
+{
+  public:
+    CExifParse  ();
+   ~CExifParse  (void)      {}
+    bool        Process     (const unsigned char* const Data, const unsigned short length, ExifInfo_t *info);
+    static int  Get16       (const void* const Short, const bool motorolaOrder=true);
+    static int  Get32       (const void* const Long,  const bool motorolaOrder=true);
+
+  private:
+    ExifInfo_t *m_ExifInfo;
+    double      m_FocalPlaneXRes;
+    double      m_FocalPlaneUnits;
+    unsigned    m_LargestExifOffset;          // Last exif data referenced (to check if thumbnail is at end)
+    int         m_ExifImageWidth;
+    bool        m_MotorolaOrder;
+    bool        m_DateFound;
+
+//    void    LocaliseDate        (void);
+//    void    GetExposureTime     (const float exposureTime);
+    double  ConvertAnyFormat    (const void* const ValuePtr, int Format);
+    void    ProcessDir          (const unsigned char* const DirStart,
+                                 const unsigned char* const OffsetBase,
+                                 const unsigned ExifLength, int NestingLevel);
+    void    ProcessGpsInfo      (const unsigned char* const DirStart,
+                                 int ByteCountUnused,
+                                 const unsigned char* const OffsetBase,
+                                 unsigned ExifLength);
+    void    GetLatLong          (const unsigned int Format,
+                                 const unsigned char* ValuePtr,
+                                 const int ComponentSize,
+                                 char *latlongString);
+};
+

Copied: branches/linuxport/XBMC/xbmc/lib/libexif/IptcParse.cpp (from rev 14129, branches/linuxport/sources/libexif/IptcParse.cpp)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libexif/IptcParse.cpp	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libexif/IptcParse.cpp	2008-07-15 21:38:33 UTC (rev 14132)
@@ -0,0 +1,178 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+//--------------------------------------------------------------------------
+// Module to pull IPTC information out of various types of digital images.
+//--------------------------------------------------------------------------
+
+//--------------------------------------------------------------------------
+//  Process IPTC data.
+//--------------------------------------------------------------------------
+#ifndef _LINUX
+#include <windows.h>
+#else
+#include <string.h>
+#define min(a,b) (a)>(b)?(b):(a)
+#endif
+#include <stdio.h>
+#include "IptcParse.h"
+#include "ExifParse.h"
+
+// Supported IPTC entry types
+#define IPTC_SUPLEMENTAL_CATEGORIES 0x14
+#define IPTC_KEYWORDS               0x19
+#define IPTC_CAPTION                0x78
+#define IPTC_AUTHOR                 0x7A
+#define IPTC_HEADLINE               0x69
+#define IPTC_SPECIAL_INSTRUCTIONS   0x28
+#define IPTC_CATEGORY               0x0F
+#define IPTC_BYLINE                 0x50
+#define IPTC_BYLINE_TITLE           0x55
+#define IPTC_CREDIT                 0x6E
+#define IPTC_SOURCE                 0x73
+#define IPTC_COPYRIGHT_NOTICE       0x74
+#define IPTC_OBJECT_NAME            0x05
+#define IPTC_CITY                   0x5A
+#define IPTC_STATE                  0x5F
+#define IPTC_COUNTRY                0x65
+#define IPTC_TRANSMISSION_REFERENCE 0x67
+#define IPTC_DATE                   0x37
+#define IPTC_COPYRIGHT              0x0A
+#define IPTC_COUNTRY_CODE           0x64
+#define IPTC_REFERENCE_SERVICE      0x2D
+
+
+//--------------------------------------------------------------------------
+//  Process IPTC marker. Return FALSE if unable to process marker.
+//
+//  IPTC block consists of:
+//    - Marker:              1 byte   (0xED)
+//    - Block length:        2 bytes
+//    - IPTC Signature:     14 bytes    ("Photoshop 3.0\0")
+//    - 8BIM Signature       4 bytes     ("8BIM")
+//    - IPTC Block start     2 bytes     (0x04, 0x04)
+//    - IPTC Header length   1 byte
+//    - IPTC header         Header is padded to even length, counting the length byte
+//    - Length               4 bytes
+//    - IPTC Data which consists of a number of entries, each of which has the following format:
+//            - Signature    2 bytes     (0x1C02)
+//            - Entry type   1 byte   (for defined entry types, see #defines above)
+//            - entry length 2 bytes
+//            - entry data   'entry length' bytes
+//
+//--------------------------------------------------------------------------
+bool CIptcParse::Process (const unsigned char* const Data, const unsigned short itemlen, IPTCInfo_t *info)
+{
+  if (!info) return false;
+
+  const char IptcSignature1[] = "Photoshop 3.0";
+  const char IptcSignature2[] = "8BIM";
+  const char IptcSignature3[] = {0x04, 0x04};
+
+  // Check IPTC signatures
+  char* pos = (char*)(Data + sizeof(short));  // position data pointer after length field
+
+  if (memcmp(pos, IptcSignature1, strlen(IptcSignature1)) != 0) return false;
+  pos += strlen(IptcSignature1) + 1;          // move data pointer to the next field
+
+  if (memcmp(pos, IptcSignature2, strlen(IptcSignature2)) != 0) return false;
+  pos += strlen(IptcSignature2);              // move data pointer to the next field
+
+  if (memcmp(pos, IptcSignature3, sizeof(IptcSignature3)) != 0) return false;
+  pos += sizeof(IptcSignature3);              // move data pointer to the next field
+
+  // IPTC section found
+
+  // Skip header
+  unsigned char headerLen = *pos++;           // get header length and move data pointer to the next field
+  pos += headerLen + 1 - (headerLen % 2);     // move data pointer to the next field (Header is padded to even length, counting the length byte)
+
+  // Get length (Motorola format)
+  unsigned long length = CExifParse::Get32(pos);
+  pos += sizeof(long);                        // move data pointer to the next field
+
+  // Now read IPTC data
+  while (pos < (char*)(Data + itemlen-5))
+  {
+    short signature = (*pos << 8) + (*(pos+1));
+
+    pos += sizeof(short);
+    if (signature != 0x1C02)
+      break;
+
+    unsigned char  type = *pos++;
+    unsigned short length  = (*pos << 8) + (*(pos+1));
+    pos += sizeof(short);                   // Skip tag length
+    // Process tag here
+    char *tag = NULL;
+    switch (type)
+    {
+      case IPTC_SUPLEMENTAL_CATEGORIES:   tag = info->SupplementalCategories;  break;
+      case IPTC_KEYWORDS:                 tag = info->Keywords;                break;
+      case IPTC_CAPTION:                  tag = info->Caption;                 break;
+      case IPTC_AUTHOR:                   tag = info->Author;                  break;
+      case IPTC_HEADLINE:                 tag = info->Headline;                break;
+      case IPTC_SPECIAL_INSTRUCTIONS:     tag = info->SpecialInstructions;     break;
+      case IPTC_CATEGORY:                 tag = info->Category;                break;
+      case IPTC_BYLINE:                   tag = info->Byline;                  break;
+      case IPTC_BYLINE_TITLE:             tag = info->BylineTitle;             break;
+      case IPTC_CREDIT:                   tag = info->Credit;                  break;
+      case IPTC_SOURCE:                   tag = info->Source;                  break;
+      case IPTC_COPYRIGHT_NOTICE:         tag = info->CopyrightNotice;         break;
+      case IPTC_OBJECT_NAME:              tag = info->ObjectName;              break;
+      case IPTC_CITY:                     tag = info->City;                    break;
+      case IPTC_STATE:                    tag = info->State;                   break;
+      case IPTC_COUNTRY:                  tag = info->Country;                 break;
+      case IPTC_TRANSMISSION_REFERENCE:   tag = info->TransmissionReference;   break;
+      case IPTC_DATE:                     tag = info->Date;                    break;
+      case IPTC_COPYRIGHT:                tag = info->Copyright;               break;
+      case IPTC_REFERENCE_SERVICE:        tag = info->ReferenceService;        break;
+      case IPTC_COUNTRY_CODE:             tag = info->CountryCode;             break;
+      default:
+        printf("IptcParse: Unrecognised IPTC tag: 0x%02x", type);
+      break;
+    }
+
+    if (tag)
+    {
+      if (type != IPTC_KEYWORDS || *tag == 0)
+      {
+        strncpy(tag, pos, min(length, MAX_IPTC_STRING - 1));
+        tag[min(length, MAX_IPTC_STRING - 1)] = 0;
+      }
+      else if (type == IPTC_KEYWORDS)
+      {
+        // there may be multiple keywords - lets join them
+        size_t maxLen = MAX_IPTC_STRING - strlen(tag);
+        if (maxLen > 2)
+          strcat(tag, ", ");
+        strncat(tag, pos, min(length, MAX_IPTC_STRING - maxLen - 3));
+      }
+/*      if (id == SLIDE_IPTC_CAPTION)
+      {
+        CExifParse::FixComment(m_IptcInfo[id]);     // Ensure comment is printable
+      }*/
+    }
+    pos += length;
+  }
+  return true;
+}
+

Copied: branches/linuxport/XBMC/xbmc/lib/libexif/IptcParse.h (from rev 14129, branches/linuxport/sources/libexif/IptcParse.h)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libexif/IptcParse.h	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libexif/IptcParse.h	2008-07-15 21:38:33 UTC (rev 14132)
@@ -0,0 +1,12 @@
+#ifndef __IPTC_PARSE_H
+#define __IPTC_PARSE_H
+
+#include "libexif.h"
+
+class CIptcParse
+{
+  public:
+    static bool Process(const unsigned char* const Data, const unsigned short length, IPTCInfo_t *info);
+};
+
+#endif      // __IPTC_H

Copied: branches/linuxport/XBMC/xbmc/lib/libexif/JpegParse.cpp (from rev 14129, branches/linuxport/sources/libexif/JpegParse.cpp)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libexif/JpegParse.cpp	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libexif/JpegParse.cpp	2008-07-15 21:38:33 UTC (rev 14132)
@@ -0,0 +1,324 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+//--------------------------------------------------------------------------
+// This module gathers information about a digital image file. This includes:
+//   - File name and path
+//   - File size
+//   - Resolution (if available)
+//   - IPTC information (if available)
+//   - EXIF information (if available)
+// All gathered information is stored in a vector of 'description' and 'value'
+// pairs (where both description and value fields are of CStdString types).
+//--------------------------------------------------------------------------
+
+#ifndef _LINUX
+#include <windows.h>
+#else
+#include <memory.h>
+#define min(a,b) (a)>(b)?(b):(a)
+typedef unsigned char BYTE;
+#endif
+#include "JpegParse.h"
+
+
+
+//--------------------------------------------------------------------------
+#define JPEG_PARSE_STRING_ID_BASE       21500
+enum {
+  ProcessUnknown = JPEG_PARSE_STRING_ID_BASE,
+  ProcessSof0,
+  ProcessSof1,
+  ProcessSof2,
+  ProcessSof3,
+  ProcessSof5,
+  ProcessSof6,
+  ProcessSof7,
+  ProcessSof9,
+  ProcessSof10,
+  ProcessSof11,
+  ProcessSof13,
+  ProcessSof14,
+  ProcessSof15,
+} E_JpegParseStringId;
+
+
+
+
+//--------------------------------------------------------------------------
+// Constructor
+//--------------------------------------------------------------------------
+CJpegParse::CJpegParse():
+  m_SectionBuffer(NULL)
+{
+  memset(&m_ExifInfo, 0, sizeof(m_ExifInfo));
+  memset(&m_IPTCInfo, 0, sizeof(m_IPTCInfo));
+}
+
+//--------------------------------------------------------------------------
+// Process a SOFn marker.  This is useful for the image dimensions
+//--------------------------------------------------------------------------
+void CJpegParse::ProcessSOFn (void)
+{
+  m_ExifInfo.Height = CExifParse::Get16(m_SectionBuffer+3);
+  m_ExifInfo.Width  = CExifParse::Get16(m_SectionBuffer+5);
+
+  unsigned char num_components = m_SectionBuffer[7];
+  if (num_components != 3)
+  {
+    m_ExifInfo.IsColor = 0;
+  }
+  else
+  {
+    m_ExifInfo.IsColor = 1;
+  }
+}
+
+
+//--------------------------------------------------------------------------
+// Read a section from a JPEG file. Note that this function allocates memory.
+// It must be called in pair with ReleaseSection
+//--------------------------------------------------------------------------
+bool CJpegParse::GetSection (FILE *infile, const unsigned short sectionLength)
+{
+  m_SectionBuffer = new unsigned char[sectionLength];
+  if (m_SectionBuffer == NULL)
+  {
+    printf("JpgParse: could not allocate memory");
+    return false;
+  }
+  // Store first two pre-read bytes.
+  m_SectionBuffer[0] = (unsigned char)(sectionLength >> 8);
+  m_SectionBuffer[1] = (unsigned char)(sectionLength && 0x00FF);
+
+  unsigned int len = (unsigned int)sectionLength;
+
+  size_t bytesRead = fread(m_SectionBuffer+sizeof(sectionLength), 1, len-sizeof(sectionLength), infile);
+  if (bytesRead != sectionLength-sizeof(sectionLength))
+  {
+    printf("JpgParse: premature end of file?");
+    delete[] m_SectionBuffer;
+    return false;
+  }
+  return true;
+}
+
+//--------------------------------------------------------------------------
+// Deallocate memory allocated in GetSection. This function must always
+// be paired by a preceeding GetSection call.
+//--------------------------------------------------------------------------
+void CJpegParse::ReleaseSection (void)
+{
+  delete[] m_SectionBuffer;
+  m_SectionBuffer = NULL;
+}
+
+//--------------------------------------------------------------------------
+// Parse the marker stream until SOS or EOI is seen; infile has already been
+// successfully open
+//--------------------------------------------------------------------------
+bool CJpegParse::ExtractInfo (FILE *infile)
+{
+  // Get file marker (two bytes - must be 0xFFD8 for JPEG files
+  BYTE a;
+  size_t bytesRead = fread(&a, 1, sizeof(BYTE), infile);
+  if ((bytesRead != sizeof(BYTE)) || (a != 0xFF))
+  {
+    return false;
+  }
+  bytesRead = fread(&a, 1, sizeof(BYTE), infile);
+  if ((bytesRead != sizeof(BYTE)) || (a != M_SOI))
+  {
+    return false;
+  }
+
+  for(;;)
+  {
+    int marker = 0;
+    for (a=0; a<7; a++) {
+      bytesRead = fread(&marker, 1, sizeof(char), infile);
+      if (marker != 0xFF)
+        break;
+
+      if (a >= 6)
+      {
+        printf("JpgParse: too many padding bytes");
+        return false;
+      }
+      marker = 0;
+    }
+
+    if (marker == 0xff)
+    {
+      // 0xff is legal padding, but if we get that many, something's wrong.
+      printf("JpgParse: too many padding bytes");
+      return false;
+    }
+
+    // Read the length of the section.
+    unsigned short itemlen = 0;
+    bytesRead = fread(&itemlen, 1, sizeof(itemlen), infile);
+    itemlen = CExifParse::Get16(&itemlen);
+
+    if ((bytesRead != sizeof(itemlen)) || (itemlen < sizeof(itemlen)))
+    {
+      printf("JpgParse: invalid marker");
+      return false;
+    }
+
+    switch(marker)
+    {
+      case M_SOS:   // stop before hitting compressed data
+      return true;
+
+      case M_EOI:   // in case it's a tables-only JPEG stream
+        printf("JpgParse: No image in jpeg!");
+        return false;
+      break;
+
+      case M_COM: // Comment section
+        GetSection(infile, itemlen);
+        if (m_SectionBuffer != NULL)
+        {
+       //   CExifParse::FixComment(comment);          // Ensure comment is printable
+          strncpy(m_ExifInfo.Comments, (char *)&m_SectionBuffer[2], min(itemlen-2, MAX_COMMENT));
+		    }
+        ReleaseSection();
+      break;
+
+      case M_SOF0:
+      case M_SOF1:
+      case M_SOF2:
+      case M_SOF3:
+      case M_SOF5:
+      case M_SOF6:
+      case M_SOF7:
+      case M_SOF9:
+      case M_SOF10:
+      case M_SOF11:
+      case M_SOF13:
+      case M_SOF14:
+      case M_SOF15:
+        GetSection(infile, itemlen);
+        if ((m_SectionBuffer != NULL) && (itemlen >= 7))
+        {
+          ProcessSOFn();
+          m_ExifInfo.Process = marker;
+        }
+        ReleaseSection();
+      break;
+
+      case M_IPTC:
+        GetSection(infile, itemlen);
+        if (m_SectionBuffer != NULL)
+        {
+          CIptcParse::Process(m_SectionBuffer, itemlen, &m_IPTCInfo);
+        }
+        ReleaseSection();
+      break;
+
+      case M_EXIF:
+        // Seen files from some 'U-lead' software with Vivitar scanner
+        // that uses marker 31 for non exif stuff.  Thus make sure
+        // it says 'Exif' in the section before treating it as exif.
+        GetSection(infile, itemlen);
+        if (m_SectionBuffer != NULL)
+        {
+          CExifParse exif;
+          exif.Process(m_SectionBuffer, itemlen, &m_ExifInfo);
+        }
+        ReleaseSection();
+      break;
+
+      case M_JFIF:
+        // Regular jpegs always have this tag, exif images have the exif
+        // marker instead, althogh ACDsee will write images with both markers.
+        // this program will re-create this marker on absence of exif marker.
+        // hence no need to keep the copy from the file.
+      // fall through to default case
+      default:
+        // Skip any other sections.
+        GetSection(infile, itemlen);
+        ReleaseSection();
+      break;
+    }
+  }
+  return true;
+}
+
+//--------------------------------------------------------------------------
+// Process a file. Check if it is JPEG. Extract exif/iptc info if it is.
+//--------------------------------------------------------------------------
+bool CJpegParse::Process (const char *picFileName)
+{
+  FILE *file;
+
+  file = fopen(picFileName, "rb");
+  if (!file)
+    return false;
+
+  // File exists and successfully opened. Start processing
+  // Gather all information about the file
+
+/*    // Get file name...
+  CStdString tmp, urlFName, path;
+  CURL url(picFileName);
+  url.GetURLWithoutUserDetails(urlFName);
+  CUtil::Split(urlFName, path, tmp);
+  m_JpegInfo[SLIDE_FILE_NAME] = tmp;
+  // ...then path...
+  m_JpegInfo[SLIDE_FILE_PATH] = path;
+
+  // ...then size...
+  __stat64 fileStat;
+  CFile::Stat(picFileName, &fileStat);
+  float fileSize = (float)fileStat.st_size;
+  tmp = "";
+  if (fileSize > 1024)
+  {
+    fileSize /= 1024;
+    tmp = "KB";
+  }
+  if (fileSize > 1024)
+  {
+    fileSize /= 1024;
+    tmp = "MB";
+  }
+  if (fileSize > 1024)
+  {
+    fileSize /= 1024;
+    tmp = "GB";
+  }
+  tmp.Format("%.2f %s", fileSize, tmp);
+  m_JpegInfo[SLIDE_FILE_SIZE] = tmp;
+
+  // ...then date and time...
+  CDateTime date((time_t)fileStat.st_mtime);
+  tmp.Format("%s %s", date.GetAsLocalizedDate(), date.GetAsLocalizedTime());
+  m_JpegInfo[SLIDE_FILE_DATE] = tmp;*/
+
+  bool result = ExtractInfo(file);
+  fclose(file);
+  if (result == false)
+    printf("JpgParse: Not a JPEG file %s", picFileName);
+  return result;
+}
+

Copied: branches/linuxport/XBMC/xbmc/lib/libexif/JpegParse.h (from rev 14129, branches/linuxport/sources/libexif/JpegParse.h)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libexif/JpegParse.h	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libexif/JpegParse.h	2008-07-15 21:38:33 UTC (rev 14132)
@@ -0,0 +1,57 @@
+#pragma once
+
+#include "IptcParse.h"
+#include "ExifParse.h"
+#include "stdio.h"
+
+//--------------------------------------------------------------------------
+// JPEG markers consist of one or more 0xFF bytes, followed by a marker
+// code byte (which is not an FF).  Here are the marker codes of interest
+// in this application.
+//--------------------------------------------------------------------------
+
+#define M_SOF0  0xC0            // Start Of Frame N
+#define M_SOF1  0xC1            // N indicates which compression process
+#define M_SOF2  0xC2            // Only SOF0-SOF2 are now in common use
+#define M_SOF3  0xC3
+#define M_SOF5  0xC5            // NB: codes C4 and CC are NOT SOF markers
+#define M_SOF6  0xC6
+#define M_SOF7  0xC7
+#define M_SOF9  0xC9
+#define M_SOF10 0xCA
+#define M_SOF11 0xCB
+#define M_SOF13 0xCD
+#define M_SOF14 0xCE
+#define M_SOF15 0xCF
+#define M_SOI   0xD8            // Start Of Image (beginning of datastream)
+#define M_EOI   0xD9            // End Of Image (end of datastream)
+#define M_SOS   0xDA            // Start Of Scan (begins compressed data)
+#define M_JFIF  0xE0            // Jfif marker
+#define M_EXIF  0xE1            // Exif marker
+#define M_COM   0xFE            // COMment
+#define M_DQT   0xDB
+#define M_DHT   0xC4
+#define M_DRI   0xDD
+#define M_IPTC  0xED            // IPTC marker
+
+
+class CJpegParse
+{
+  public:
+    CJpegParse   ();
+   ~CJpegParse   (void)  {}
+    bool         Process (const char *picFileName);
+    const ExifInfo_t * GetExifInfo() const { return &m_ExifInfo; };
+    const IPTCInfo_t * GetIptcInfo() const { return &m_IPTCInfo; };
+
+  private:
+    bool ExtractInfo    (FILE *infile);
+    bool GetSection     (FILE *infile, const unsigned short sectionLength);
+    void ReleaseSection (void);
+    void ProcessSOFn    (void);
+
+    unsigned char*  m_SectionBuffer;
+    ExifInfo_t      m_ExifInfo;
+    IPTCInfo_t      m_IPTCInfo;
+};
+

Copied: branches/linuxport/XBMC/xbmc/lib/libexif/Makefile (from rev 14129, branches/linuxport/sources/libexif/Makefile)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libexif/Makefile	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libexif/Makefile	2008-07-15 21:38:33 UTC (rev 14132)
@@ -0,0 +1,15 @@
+CC=gcc
+OBJS=libexif.o ExifParse.o IptcParse.o JpegParse.o
+CFLAGS=-D_LINUX -D_DLL -fPIC -O2
+
+libexif-i486-linux.so: $(OBJS)
+	$(CC) -shared -o $@ *.o `cat ../../cores/DllLoader/exports/wrapper.def` ../../cores/DllLoader/exports/wrapper.o && cp $@ ../../../system/
+
+clean:
+	$(RM) $(OBJS) *.so
+
+%o : %cpp
+	g++ -c -o $@ $< $(CFLAGS)
+
+%o : %c
+	$(CC) -c -o $@ $< $(CFLAGS)

Copied: branches/linuxport/XBMC/xbmc/lib/libexif/libexif.cpp (from rev 14129, branches/linuxport/sources/libexif/libexif.cpp)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libexif/libexif.cpp	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libexif/libexif.cpp	2008-07-15 21:38:33 UTC (rev 14132)
@@ -0,0 +1,42 @@
+// libexif.cpp : Defines the entry point for the console application.
+//
+
+#ifndef _LINUX
+#include <windows.h>
+#else
+#include <memory.h>
+#endif
+#include "JpegParse.h"
+#include "libexif.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+bool process_jpeg(const char *filename, ExifInfo_t *exifInfo, IPTCInfo_t *iptcInfo)
+{
+  if (!exifInfo || !iptcInfo) return false;
+  CJpegParse jpeg;
+  memset(exifInfo, 0, sizeof(ExifInfo_t));
+  memset(iptcInfo, 0, sizeof(IPTCInfo_t));
+  if (jpeg.Process(filename))
+  {
+    memcpy(exifInfo, jpeg.GetExifInfo(), sizeof(ExifInfo_t));
+    memcpy(iptcInfo, jpeg.GetIptcInfo(), sizeof(IPTCInfo_t));
+    return true;
+  }
+  return false;
+}
+#ifdef __cplusplus
+}
+#endif
+
+#ifndef _DLL
+int main(int argc, char* argv[])
+{
+  ExifInfo_t exifInfo;
+  IPTCInfo_t iptcInfo;
+  process_jpeg("C:\\Documents and Settings\\jcmarsha\\My Documents\\My Pictures\\396179226_f09242e21e_o.jpg", &exifInfo, &iptcInfo);
+	return 0;
+}
+#endif

Deleted: branches/linuxport/XBMC/xbmc/lib/libexif/libexif.h
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libexif/libexif.h	2008-07-15 21:35:46 UTC (rev 14131)
+++ branches/linuxport/XBMC/xbmc/lib/libexif/libexif.h	2008-07-15 21:38:33 UTC (rev 14132)
@@ -1,122 +0,0 @@
-#ifndef HAS_LIBEXIF_H
-#define HAS_LIBEXIF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef _DLL
-#define EXIF_EXPORT __declspec(dllexport)
-#else
-#define EXIF_EXPORT
-#endif
-
-//--------------------------------------------------------------------------
-// JPEG markers consist of one or more 0xFF bytes, followed by a marker
-// code byte (which is not an FF).  Here are the marker codes of interest
-// in this application.
-//--------------------------------------------------------------------------
-
-#define M_SOF0  0xC0            // Start Of Frame N
-#define M_SOF1  0xC1            // N indicates which compression process
-#define M_SOF2  0xC2            // Only SOF0-SOF2 are now in common use
-#define M_SOF3  0xC3
-#define M_SOF5  0xC5            // NB: codes C4 and CC are NOT SOF markers
-#define M_SOF6  0xC6
-#define M_SOF7  0xC7
-#define M_SOF9  0xC9
-#define M_SOF10 0xCA
-#define M_SOF11 0xCB
-#define M_SOF13 0xCD
-#define M_SOF14 0xCE
-#define M_SOF15 0xCF
-#define M_SOI   0xD8            // Start Of Image (beginning of datastream)
-#define M_EOI   0xD9            // End Of Image (end of datastream)
-#define M_SOS   0xDA            // Start Of Scan (begins compressed data)
-#define M_JFIF  0xE0            // Jfif marker
-#define M_EXIF  0xE1            // Exif marker
-#define M_COM   0xFE            // COMment
-#define M_DQT   0xDB
-#define M_DHT   0xC4
-#define M_DRI   0xDD
-#define M_IPTC  0xED            // IPTC marker
-
-#define MAX_IPTC_STRING 256
-
-typedef struct {
-  char SupplementalCategories[MAX_IPTC_STRING];
-  char Keywords[MAX_IPTC_STRING];
-  char Caption[MAX_IPTC_STRING];
-  char Author[MAX_IPTC_STRING];
-  char Headline[MAX_IPTC_STRING];
-  char SpecialInstructions[MAX_IPTC_STRING];
-  char Category[MAX_IPTC_STRING];
-  char Byline[MAX_IPTC_STRING];
-  char BylineTitle[MAX_IPTC_STRING];
-  char Credit[MAX_IPTC_STRING];
-  char Source[MAX_IPTC_STRING];
-  char CopyrightNotice[MAX_IPTC_STRING];
-  char ObjectName[MAX_IPTC_STRING];
-  char City[MAX_IPTC_STRING];
-  char State[MAX_IPTC_STRING];
-  char Country[MAX_IPTC_STRING];
-  char TransmissionReference[MAX_IPTC_STRING];
-  char Date[MAX_IPTC_STRING];
-  char Copyright[MAX_IPTC_STRING];
-  char ReferenceService[MAX_IPTC_STRING];
-  char CountryCode[MAX_IPTC_STRING];
-} IPTCInfo_t;
-
-#define MAX_COMMENT 2000
-#define MAX_DATE_COPIES 10
-
-typedef struct {
-    char  CameraMake   [32];
-    char  CameraModel  [40];
-    char  DateTime     [20];
-    int   Height, Width;
-    int   Orientation;
-    int   IsColor;
-    int   Process;
-    int   FlashUsed;
-    float FocalLength;
-    float ExposureTime;
-    float ApertureFNumber;
-    float Distance;
-    float CCDWidth;
-    float ExposureBias;
-    float DigitalZoomRatio;
-    int   FocalLength35mmEquiv; // Exif 2.2 tag - usually not present.
-    int   Whitebalance;
-    int   MeteringMode;
-    int   ExposureProgram;
-    int   ExposureMode;
-    int   ISOequivalent;
-    int   LightSource;
-    char  Comments[MAX_COMMENT];
-
-    unsigned ThumbnailOffset;          // Exif offset to thumbnail
-    unsigned ThumbnailSize;            // Size of thumbnail.
-    unsigned LargestExifOffset;        // Last exif data referenced (to check if thumbnail is at end)
-
-    char  ThumbnailAtEnd;              // Exif header ends with the thumbnail
-                                       // (we can only modify the thumbnail if its at the end)
-    int   ThumbnailSizeOffset;
-
-    int  DateTimeOffsets[MAX_DATE_COPIES];
-    int  numDateTimeTags;
-
-    int GpsInfoPresent;
-    char GpsLat[31];
-    char GpsLong[31];
-    char GpsAlt[20];
-} ExifInfo_t;
-
-EXIF_EXPORT bool process_jpeg(const char *filename, ExifInfo_t *exifInfo, IPTCInfo_t *iptcInfo);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-

Copied: branches/linuxport/XBMC/xbmc/lib/libexif/libexif.h (from rev 14129, branches/linuxport/sources/libexif/libexif.h)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libexif/libexif.h	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libexif/libexif.h	2008-07-15 21:38:33 UTC (rev 14132)
@@ -0,0 +1,126 @@
+#ifndef HAS_LIBEXIF_H
+#define HAS_LIBEXIF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef _DLL
+#ifdef WIN32
+#define EXIF_EXPORT __declspec(dllexport)
+#else
+#define EXIF_EXPORT
+#endif
+#else
+#define EXIF_EXPORT
+#endif
+
+//--------------------------------------------------------------------------
+// JPEG markers consist of one or more 0xFF bytes, followed by a marker
+// code byte (which is not an FF).  Here are the marker codes of interest
+// in this application.
+//--------------------------------------------------------------------------
+
+#define M_SOF0  0xC0            // Start Of Frame N
+#define M_SOF1  0xC1            // N indicates which compression process
+#define M_SOF2  0xC2            // Only SOF0-SOF2 are now in common use
+#define M_SOF3  0xC3
+#define M_SOF5  0xC5            // NB: codes C4 and CC are NOT SOF markers
+#define M_SOF6  0xC6
+#define M_SOF7  0xC7
+#define M_SOF9  0xC9
+#define M_SOF10 0xCA
+#define M_SOF11 0xCB
+#define M_SOF13 0xCD
+#define M_SOF14 0xCE
+#define M_SOF15 0xCF
+#define M_SOI   0xD8            // Start Of Image (beginning of datastream)
+#define M_EOI   0xD9            // End Of Image (end of datastream)
+#define M_SOS   0xDA            // Start Of Scan (begins compressed data)
+#define M_JFIF  0xE0            // Jfif marker
+#define M_EXIF  0xE1            // Exif marker
+#define M_COM   0xFE            // COMment
+#define M_DQT   0xDB
+#define M_DHT   0xC4
+#define M_DRI   0xDD
+#define M_IPTC  0xED            // IPTC marker
+
+#define MAX_IPTC_STRING 256
+
+typedef struct {
+  char SupplementalCategories[MAX_IPTC_STRING];
+  char Keywords[MAX_IPTC_STRING];
+  char Caption[MAX_IPTC_STRING];
+  char Author[MAX_IPTC_STRING];
+  char Headline[MAX_IPTC_STRING];
+  char SpecialInstructions[MAX_IPTC_STRING];
+  char Category[MAX_IPTC_STRING];
+  char Byline[MAX_IPTC_STRING];
+  char BylineTitle[MAX_IPTC_STRING];
+  char Credit[MAX_IPTC_STRING];
+  char Source[MAX_IPTC_STRING];
+  char CopyrightNotice[MAX_IPTC_STRING];
+  char ObjectName[MAX_IPTC_STRING];
+  char City[MAX_IPTC_STRING];
+  char State[MAX_IPTC_STRING];
+  char Country[MAX_IPTC_STRING];
+  char TransmissionReference[MAX_IPTC_STRING];
+  char Date[MAX_IPTC_STRING];
+  char Copyright[MAX_IPTC_STRING];
+  char ReferenceService[MAX_IPTC_STRING];
+  char CountryCode[MAX_IPTC_STRING];
+} IPTCInfo_t;
+
+#define MAX_COMMENT 2000
+#define MAX_DATE_COPIES 10
+
+typedef struct {
+    char  CameraMake   [32];
+    char  CameraModel  [40];
+    char  DateTime     [20];
+    int   Height, Width;
+    int   Orientation;
+    int   IsColor;
+    int   Process;
+    int   FlashUsed;
+    float FocalLength;
+    float ExposureTime;
+    float ApertureFNumber;
+    float Distance;
+    float CCDWidth;
+    float ExposureBias;
+    float DigitalZoomRatio;
+    int   FocalLength35mmEquiv; // Exif 2.2 tag - usually not present.
+    int   Whitebalance;
+    int   MeteringMode;
+    int   ExposureProgram;
+    int   ExposureMode;
+    int   ISOequivalent;
+    int   LightSource;
+    char  Comments[MAX_COMMENT];
+
+    unsigned ThumbnailOffset;          // Exif offset to thumbnail
+    unsigned ThumbnailSize;            // Size of thumbnail.
+    unsigned LargestExifOffset;        // Last exif data referenced (to check if thumbnail is at end)
+
+    char  ThumbnailAtEnd;              // Exif header ends with the thumbnail
+                                       // (we can only modify the thumbnail if its at the end)
+    int   ThumbnailSizeOffset;
+
+    int  DateTimeOffsets[MAX_DATE_COPIES];
+    int  numDateTimeTags;
+
+    int GpsInfoPresent;
+    char GpsLat[31];
+    char GpsLong[31];
+    char GpsAlt[20];
+} ExifInfo_t;
+
+EXIF_EXPORT bool process_jpeg(const char *filename, ExifInfo_t *exifInfo, IPTCInfo_t *iptcInfo);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+

Copied: branches/linuxport/XBMC/xbmc/lib/libexif/libexif.sln (from rev 14129, branches/linuxport/sources/libexif/libexif.sln)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libexif/libexif.sln	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libexif/libexif.sln	2008-07-15 21:38:33 UTC (rev 14132)
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libexif", "libexif.vcproj", "{AD20A3E2-09CB-42DB-9A70-27F7CDC886CE}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+		Release (DLL) = Release (DLL)
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{AD20A3E2-09CB-42DB-9A70-27F7CDC886CE}.Debug.ActiveCfg = Debug|Win32
+		{AD20A3E2-09CB-42DB-9A70-27F7CDC886CE}.Debug.Build.0 = Debug|Win32
+		{AD20A3E2-09CB-42DB-9A70-27F7CDC886CE}.Release.ActiveCfg = Release|Win32
+		{AD20A3E2-09CB-42DB-9A70-27F7CDC886CE}.Release.Build.0 = Release|Win32
+		{AD20A3E2-09CB-42DB-9A70-27F7CDC886CE}.Release (DLL).ActiveCfg = Release (DLL)|Win32
+		{AD20A3E2-09CB-42DB-9A70-27F7CDC886CE}.Release (DLL).Build.0 = Release (DLL)|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal

Copied: branches/linuxport/XBMC/xbmc/lib/libexif/libexif.vcproj (from rev 14129, branches/linuxport/sources/libexif/libexif.vcproj)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libexif/libexif.vcproj	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libexif/libexif.vcproj	2008-07-15 21:38:33 UTC (rev 14132)
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="libexif"
+	ProjectGUID="{AD20A3E2-09CB-42DB-9A70-27F7CDC886CE}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/libexif.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/libexif.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/libexif.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release (DLL)|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_DLL"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/libexif.dll"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath=".\ExifParse.cpp">
+			</File>
+			<File
+				RelativePath=".\ExifParse.h">
+			</File>
+			<File
+				RelativePath=".\IptcParse.cpp">
+			</File>
+			<File
+				RelativePath=".\IptcParse.h">
+			</File>
+			<File
+				RelativePath=".\JpegParse.cpp">
+			</File>
+			<File
+				RelativePath=".\JpegParse.h">
+			</File>
+			<File
+				RelativePath=".\libexif.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+		<File
+			RelativePath=".\ReadMe.txt">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Deleted: branches/linuxport/sources/libexif/ExifParse.cpp
===================================================================
--- branches/linuxport/sources/libexif/ExifParse.cpp	2008-07-15 21:35:46 UTC (rev 14131)
+++ branches/linuxport/sources/libexif/ExifParse.cpp	2008-07-15 21:38:33 UTC (rev 14132)
@@ -1,894 +0,0 @@
-/*
- *      Copyright (C) 2005-2007 Team XboxMediaCenter
- *      http://www.xboxmediacenter.com
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-//--------------------------------------------------------------------------
-// Program to pull the EXIF information out of various types of digital
-// images and present it in a reasonably consistent way
-//
-// Original code pulled from 'jhead' by Matthias Wandel (http://www.sentex.net/~mwandel/) - jhead
-// Adapted for XBMC by DD.
-//--------------------------------------------------------------------------
-
-// Note: Jhead supports TAG_MAKER_NOTE exif field,
-//       but that is ommited for now - to make porting easier and addition smaller
-#ifndef _LINUX
-#include <windows.h>
-#else
-#include <memory.h>
-#define min(a,b) (a)>(b)?(b):(a)
-#define max(a,b) (a)<(b)?(b):(a)
-#endif
-#include <math.h>
-#include <stdio.h>
-#include "ExifParse.h"
-
-
-// Prototypes for exif utility functions.
-static void ErrNonfatal(const void* const msg, int a1, int a2);
-
-#define DIR_ENTRY_ADDR(Start, Entry) ((Start)+2+12*(Entry))
-
-
-//--------------------------------------------------------------------------
-// Describes tag values
-#define TAG_DESCRIPTION        0x010E
-#define TAG_MAKE               0x010F
-#define TAG_MODEL              0x0110
-#define TAG_ORIENTATION        0x0112
-#define TAG_X_RESOLUTION       0x011A           // Not processed. Format rational64u (see http://search.cpan.org/src/EXIFTOOL/Image-ExifTool-6.76/html/TagNames/EXIF.html)
-#define TAG_Y_RESOLUTION       0x011B           // Not processed. Format rational64u
-#define TAG_RESOLUTION_UNIT    0x0128           // Not processed. Format int16u. Values: 1-none; 2-inches; 3-cm
-#define TAG_SOFTWARE           0x0131
-#define TAG_DATETIME           0x0132
-#define TAG_THUMBNAIL_OFFSET   0x0201
-#define TAG_THUMBNAIL_LENGTH   0x0202
-#define TAG_Y_CB_CR_POS        0x0213           // Not processed. Format int16u. Values: 1-Centered; 2-Co-sited
-#define TAG_EXPOSURETIME       0x829A
-#define TAG_FNUMBER            0x829D
-#define TAG_EXIF_OFFSET        0x8769
-#define TAG_EXPOSURE_PROGRAM   0x8822
-#define TAG_GPSINFO            0x8825
-#define TAG_ISO_EQUIVALENT     0x8827
-#define TAG_EXIF_VERSION       0x9000           // Not processed.
-#define TAG_COMPONENT_CFG      0x9101           // Not processed.
-#define TAG_DATETIME_ORIGINAL  0x9003
-#define TAG_DATETIME_DIGITIZED 0x9004
-#define TAG_SHUTTERSPEED       0x9201
-#define TAG_APERTURE           0x9202
-#define TAG_EXPOSURE_BIAS      0x9204
-#define TAG_MAXAPERTURE        0x9205
-#define TAG_SUBJECT_DISTANCE   0x9206
-#define TAG_METERING_MODE      0x9207
-#define TAG_LIGHT_SOURCE       0x9208
-#define TAG_FLASH              0x9209
-#define TAG_FOCALLENGTH        0x920A
-#define TAG_MAKER_NOTE         0x927C           // Not processed yet. Maybe in the future.
-#define TAG_USERCOMMENT        0x9286
-#define TAG_FLASHPIX_VERSION   0xA000           // Not processed.
-#define TAG_COLOUR_SPACE       0xA001           // Not processed. Format int16u. Values: 1-RGB; 2-Adobe RGB 65535-Uncalibrated
-#define TAG_EXIF_IMAGEWIDTH    0xa002
-#define TAG_EXIF_IMAGELENGTH   0xa003
-#define TAG_INTEROP_OFFSET     0xa005
-#define TAG_FOCALPLANEXRES     0xa20E
-#define TAG_FOCALPLANEUNITS    0xa210
-#define TAG_EXPOSURE_INDEX     0xa215
-#define TAG_EXPOSURE_MODE      0xa402
-#define TAG_WHITEBALANCE       0xa403
-#define TAG_DIGITALZOOMRATIO   0xA404
-#define TAG_FOCALLENGTH_35MM   0xa405
-
-#define TAG_GPS_LAT_REF        1
-#define TAG_GPS_LAT            2
-#define TAG_GPS_LONG_REF       3
-#define TAG_GPS_LONG           4
-#define TAG_GPS_ALT_REF        5
-#define TAG_GPS_ALT            6
-
-//--------------------------------------------------------------------------
-// Exif format descriptor stuff
-#define FMT_BYTE       1
-#define FMT_STRING     2
-#define FMT_USHORT     3
-#define FMT_ULONG      4
-#define FMT_URATIONAL  5
-#define FMT_SBYTE      6
-#define FMT_UNDEFINED  7
-#define FMT_SSHORT     8
-#define FMT_SLONG      9
-#define FMT_SRATIONAL 10
-#define FMT_SINGLE    11
-#define FMT_DOUBLE    12
-// NOTE: Remember to change NUM_FORMATS if you define a new format
-#define NUM_FORMATS   12
-
-//--------------------------------------------------------------------------
-// Internationalisation string IDs. The enum order must match that in the
-// language file (e.g. 'language/English/strings.xml', and EXIF_PARSE_STRING_ID_BASE
-// must match the ID of the first Exif string in that file.
-#define EXIF_PARSE_STRING_ID_BASE       21800
-enum {
-// Distance
-  ExifStrDistanceInfinite = EXIF_PARSE_STRING_ID_BASE,
-// Whitebalance et.al.
-  ExifStrManual,
-  ExifStrAuto,
-// Flash modes
-  ExifStrYes,
-  ExifStrNo,
-  ExifStrFlashNoStrobe,
-  ExifStrFlashStrobe,
-  ExifStrFlashManual,
-  ExifStrFlashManualNoReturn,
-  ExifStrFlashManualReturn,
-  ExifStrFlashAuto,
-  ExifStrFlashAutoNoReturn,
-  ExifStrFlashAutoReturn,
-  ExifStrFlashRedEye,
-  ExifStrFlashRedEyeNoReturn,
-  ExifStrFlashRedEyeReturn,
-  ExifStrFlashManualRedEye,
-  ExifStrFlashManualRedEyeNoReturn,
-  ExifStrFlashManualRedEyeReturn,
-  ExifStrFlashAutoRedEye,
-  ExifStrFlashAutoRedEyeNoReturn,
-  ExifStrFlashAutoRedEyeReturn,
-// Light sources
-  ExifStrDaylight,
-  ExifStrFluorescent,
-  ExifStrIncandescent,
-  ExifStrFlash,
-  ExifStrFineWeather,
-  ExifStrShade,
-// Metering Mode
-  ExifStrMeteringCenter,
-  ExifStrMeteringSpot,
-  ExifStrMeteringMatrix,
-// Exposure Program
-  ExifStrExposureProgram,
-  ExifStrExposureAperture,
-  ExifStrExposureShutter,
-  ExifStrExposureCreative,
-  ExifStrExposureAction,
-  ExifStrExposurePortrait,
-  ExifStrExposureLandscape,
-// Exposure mode
-  ExifStrExposureModeAuto,
-// ISO equivalent
-  ExifStrIsoEquivalent,
-// GPS latitude, longitude, altitude
-  ExifStrGpsLatitude,
-  ExifStrGpsLongitude,
-  ExifStrGpsAltitude,
-} E_ExifParseStringId;
-
-
-
-
-//--------------------------------------------------------------------------
-// Report non fatal errors.  Now that microsoft.net modifies exif headers,
-// there's corrupted ones, and there could be more in the future.
-//--------------------------------------------------------------------------
-static void ErrNonfatal(const char* const msg, int a1, int a2)
-{
-  printf("ExifParse - Nonfatal Error : %s %d %d", msg, a1, a2);
-}
-
-//--------------------------------------------------------------------------
-// Constructor.
-//--------------------------------------------------------------------------
-CExifParse::CExifParse () : m_FocalPlaneXRes(0.0),
-        m_FocalPlaneUnits(0.0), m_ExifImageWidth(0), m_MotorolaOrder(false),
-        m_DateFound(false)
-{
-  m_ExifInfo = NULL;
-}
-
-//--------------------------------------------------------------------------
-// Convert a 16 bit unsigned value from file's native byte order
-//--------------------------------------------------------------------------
-int CExifParse::Get16(const void* const Short, const bool motorolaOrder)
-{
-    int retVal = *(unsigned short*)Short;
-    if (motorolaOrder) {
-        retVal = ((retVal & 0x00FF) << 8) |
-                 ((retVal & 0xFF00) >> 8);
-    }
-    return retVal;
-}
-
-//--------------------------------------------------------------------------
-// Convert a 32 bit signed value from file's native byte order
-//--------------------------------------------------------------------------
-int CExifParse::Get32(const void* const Long, const bool motorolaOrder)
-{
-    int retVal = *(unsigned long*)Long;
-    if (motorolaOrder) {
-        retVal = ((retVal & 0x000000FF) << 24) |
-                 ((retVal & 0x0000FF00) << 8)  |
-                 ((retVal & 0x00FF0000) >> 8)  |
-                 ((retVal & 0xFF000000) >> 24);
-    }
-    return retVal;
-}
-
-//--------------------------------------------------------------------------
-// It appears that CStdString constructor replaces "\n" with "\r\n" which results
-// in "\r\r\n" if there already is "\r\n", which in turn results in corrupted
-// display. So this is an attempt to undo effects of a smart constructor. Also,
-// replaces all nonprintable characters with "."
-//--------------------------------------------------------------------------
-/*void CExifParse::FixComment(CStdString& comment)
-{
-  comment.Replace("\r\r\n", "\r\n");
-  for (unsigned int i=0; i<comment.length(); i++)
-  {
-    if ((comment[i] < 32) && (comment[i] != '\n') && (comment[i] != '\t') && (comment[i] != '\r'))
-    {
-      comment[i] = '.';
-    }
-  }
-}*/
-
-//--------------------------------------------------------------------------
-// Evaluate number, be it int, rational, or float from directory.
-//--------------------------------------------------------------------------
-double CExifParse::ConvertAnyFormat(const void* const ValuePtr, int Format)
-{
-  double Value;
-  Value = 0;
-
-  switch(Format)
-  {
-    case FMT_SBYTE:     Value = *(  signed char*)ValuePtr;          break;
-    case FMT_BYTE:      Value = *(unsigned char*)ValuePtr;          break;
-
-    case FMT_USHORT:    Value = Get16(ValuePtr, m_MotorolaOrder);   break;
-    case FMT_ULONG:     Value = Get32(ValuePtr, m_MotorolaOrder);   break;
-
-    case FMT_URATIONAL:
-    case FMT_SRATIONAL:
-    {
-      int Num,Den;
-      Num = Get32(ValuePtr, m_MotorolaOrder);
-      Den = Get32(4+(char *)ValuePtr, m_MotorolaOrder);
-
-      if (Den == 0)    Value = 0;
-      else             Value = (double)Num/Den;
-    }
-    break;
-
-    case FMT_SSHORT:    Value = (signed short)Get16(ValuePtr, m_MotorolaOrder);    break;
-    case FMT_SLONG:     Value = Get32(ValuePtr, m_MotorolaOrder);                  break;
-
-    // Not sure if this is correct (never seen float used in Exif format)
-    case FMT_SINGLE:    Value = (double)*(float*)ValuePtr;          break;
-    case FMT_DOUBLE:    Value = *(double*)ValuePtr;                 break;
-
-    default:
-      ErrNonfatal("Illegal format code %d",Format,0);
-  }
-  return Value;
-}
-
-//--------------------------------------------------------------------------
-// Exif date tag is stored as a fixed format string "YYYY:MM:DD HH:MM:SS".
-// If date is not set, then the string is filled with blanks and colons:
-// "    :  :     :  :  ". We want this string localised.
-//--------------------------------------------------------------------------
-/*void CExifParse::LocaliseDate (void)
-{
-    if (m_ExifInfo[SLIDE_EXIF_DATE_TIME][0] != ' ')
-    {
-        int year  = atoi(m_ExifInfo[SLIDE_EXIF_DATE_TIME].substr(0, 4).c_str());
-        int month = atoi(m_ExifInfo[SLIDE_EXIF_DATE_TIME].substr(5, 2).c_str());
-        int day   = atoi(m_ExifInfo[SLIDE_EXIF_DATE_TIME].substr(8, 2).c_str());
-        int hour  = atoi(m_ExifInfo[SLIDE_EXIF_DATE_TIME].substr(11,2).c_str());
-        int min   = atoi(m_ExifInfo[SLIDE_EXIF_DATE_TIME].substr(14,2).c_str());
-        int sec   = atoi(m_ExifInfo[SLIDE_EXIF_DATE_TIME].substr(17,2).c_str());
-        CDateTime date(year, month, day, hour, min, sec);
-        m_ExifInfo[SLIDE_EXIF_DATE_TIME] = date.GetAsLocalizedDateTime();
-    }
-}*/
-
-
-//--------------------------------------------------------------------------
-// Convert exposure time into a human readable format
-//--------------------------------------------------------------------------
-/*void CExifParse::GetExposureTime(const float exposureTime, CStdString& outStr)
-{
-  if (exposureTime)
-  {
-    if (exposureTime < 0.010)   outStr.Format("%6.4fs ", exposureTime);
-    else                        outStr.Format("%5.3fs ", exposureTime);
-    if (exposureTime <= 0.5)    outStr.Format("%s (1/%d)", outStr, (int)(0.5 + 1/exposureTime));
-  }
-}*/
-
-//--------------------------------------------------------------------------
-// Process one of the nested EXIF directories.
-//--------------------------------------------------------------------------
-void CExifParse::ProcessDir(const unsigned char* const DirStart,
-                            const unsigned char* const OffsetBase,
-                            const unsigned ExifLength,
-                            int NestingLevel)
-{
-  if (NestingLevel > 4)
-  {
-    ErrNonfatal("Maximum directory nesting exceeded (corrupt exif header)", 0,0);
-    return;
-  }
-
-  char IndentString[25];
-  memset(IndentString, ' ', 25);
-  IndentString[NestingLevel * 4] = '\0';
-
-
-  int NumDirEntries = Get16((void*)DirStart, m_MotorolaOrder);
-
-  const unsigned char* const DirEnd = DIR_ENTRY_ADDR(DirStart, NumDirEntries);
-  if (DirEnd+4 > (OffsetBase+ExifLength))
-  {
-    if (DirEnd+2 == OffsetBase+ExifLength || DirEnd == OffsetBase+ExifLength)
-    {
-      // Version 1.3 of jhead would truncate a bit too much.
-      // This also caught later on as well.
-    }
-    else
-    {
-      ErrNonfatal("Illegally sized directory", 0,0);
-      return;
-    }
-  }
-
-  int     flashUsed       = -1;
-  int     isoEquivalent   = 0;
-  float   exposureTime    = 0.0;
-  float   apertureFNumber = 0.0;
-  const int BytesPerFormat[] = {0,1,1,2,4,8,1,1,2,4,8,4,8};
-
-
-  for (int de=0;de<NumDirEntries;de++)
-  {
-    int Tag, Format, Components;
-    unsigned char* ValuePtr;
-    int ByteCount;
-    const unsigned char* const DirEntry = DIR_ENTRY_ADDR(DirStart, de);
-
-    Tag = Get16(DirEntry, m_MotorolaOrder);
-    Format = Get16(DirEntry+2, m_MotorolaOrder);
-    Components = Get32(DirEntry+4, m_MotorolaOrder);
-
-    if ((Format-1) >= NUM_FORMATS)
-    {
-      // (-1) catches illegal zero case as unsigned underflows to positive large.
-      ErrNonfatal("Illegal number format %d for tag %04x", Format, Tag);
-      continue;
-    }
-
-    if ((unsigned)Components > 0x10000)
-    {
-      ErrNonfatal("Illegal number of components %d for tag %04x", Components, Tag);
-      continue;
-    }
-
-    ByteCount = Components * BytesPerFormat[Format];
-
-    if (ByteCount > 4)
-    {
-      unsigned OffsetVal;
-      OffsetVal = Get32(DirEntry+8, m_MotorolaOrder);
-      // If its bigger than 4 bytes, the dir entry contains an offset.
-      if (OffsetVal+ByteCount > ExifLength)
-      {
-        // Bogus pointer offset and / or bytecount value
-        ErrNonfatal("Illegal value pointer for tag %04x", Tag,0);
-        continue;
-      }
-      ValuePtr = (unsigned char*)(OffsetBase+OffsetVal);
-
-      if (OffsetVal > m_LargestExifOffset)
-      {
-        m_LargestExifOffset = OffsetVal;
-      }
-
-    }
-    else {
-      // 4 bytes or less and value is in the dir entry itself
-      ValuePtr = (unsigned char*)(DirEntry+8);
-    }
-
-
-    // Extract useful components of tag
-    switch(Tag)
-    {
-//      case TAG_DESCRIPTION:       strncpy(m_ExifInfo->Description, ValuePtr, 5);    break;
-      case TAG_MAKE:              strncpy(m_ExifInfo->CameraMake, (char *)ValuePtr, 32);    break;
-      case TAG_MODEL:             strncpy(m_ExifInfo->CameraModel, (char *)ValuePtr, 40);    break;
-//      case TAG_SOFTWARE:          strncpy(m_ExifInfo->Software, ValuePtr, 5);    break;
-      case TAG_FOCALPLANEXRES:    m_FocalPlaneXRes  = ConvertAnyFormat(ValuePtr, Format);               break;
-      case TAG_THUMBNAIL_OFFSET:  m_ExifInfo->ThumbnailOffset = (unsigned)ConvertAnyFormat(ValuePtr, Format);     break;
-      case TAG_THUMBNAIL_LENGTH:  m_ExifInfo->ThumbnailSize   = (unsigned)ConvertAnyFormat(ValuePtr, Format);     break;
-
-      case TAG_MAKER_NOTE:
-        continue;
-      break;
-
-      case TAG_DATETIME_ORIGINAL:
-        // If we get a DATETIME_ORIGINAL, we use that one.
-        strncpy(m_ExifInfo->DateTime, (char *)ValuePtr, 20);
-        m_DateFound = true;
-      break;
-
-      case TAG_DATETIME_DIGITIZED:
-      case TAG_DATETIME:
-        if (m_DateFound == false)
-        {
-          // If we don't already have a DATETIME_ORIGINAL, use whatever
-          // time fields we may have.
-          strncpy(m_ExifInfo->DateTime, (char *)ValuePtr, 20);
-//          LocaliseDate();
-        }
-      break;
-
-      case TAG_USERCOMMENT:
-      {
-        const int EXIF_COMMENT_HDR_LENGTH = 8;        // All comment tags have 8 bytes of header info
-        int length = max(ByteCount - EXIF_COMMENT_HDR_LENGTH, 0);
-        length = min(length, 2000);
-        strncpy(m_ExifInfo->Comments, (char *)ValuePtr+EXIF_COMMENT_HDR_LENGTH, length);
-//        FixComment(comment);                          // Ensure comment is printable
-      }
-      break;
-
-      case TAG_FNUMBER:
-        // Simplest way of expressing aperture, so I trust it the most.
-        // (overwrite previously computd value if there is one)
-        m_ExifInfo->ApertureFNumber = (float)ConvertAnyFormat(ValuePtr, Format);
-      break;
-
-      case TAG_APERTURE:
-      case TAG_MAXAPERTURE:
-        // More relevant info always comes earlier, so only use this field if we don't
-        // have appropriate aperture information yet.
-        if (m_ExifInfo->ApertureFNumber == 0)
-        {
-          m_ExifInfo->ApertureFNumber = (float)exp(ConvertAnyFormat(ValuePtr, Format)*log(2.0)*0.5);
-        }
-      break;
-
-      case TAG_FOCALLENGTH:
-        // Nice digital cameras actually save the focal length as a function
-        // of how far they are zoomed in.
-        m_ExifInfo->FocalLength = (float)ConvertAnyFormat(ValuePtr, Format);
-      break;
-
-      case TAG_SUBJECT_DISTANCE:
-        // Inidcates the distacne the autofocus camera is focused to.
-        // Tends to be less accurate as distance increases.
-        {
-          float distance = (float)ConvertAnyFormat(ValuePtr, Format);
-          if (distance < 0)
-            m_ExifInfo->Distance = distance; // infinite
-          else             
-            m_ExifInfo->Distance = distance;
-        }
-      break;
-
-      case TAG_EXPOSURETIME:
-        {
-        // Simplest way of expressing exposure time, so I trust it most.
-        // (overwrite previously computd value if there is one)
-        float expTime = (float)ConvertAnyFormat(ValuePtr, Format);
-        if (expTime)
-          m_ExifInfo->ExposureTime = expTime;
-        }
-      break;
-
-      case TAG_SHUTTERSPEED:
-        // More complicated way of expressing exposure time, so only use
-        // this value if we don't already have it from somewhere else.
-        if (m_ExifInfo->ExposureTime == 0)
-        {
-          m_ExifInfo->ExposureTime = (float)(1/exp(ConvertAnyFormat(ValuePtr, Format)*log(2.0)));
-        }
-      break;
-
-      case TAG_FLASH:
-        m_ExifInfo->FlashUsed = (int)ConvertAnyFormat(ValuePtr, Format);
-      break;
-
-      case TAG_ORIENTATION:
-        m_ExifInfo->Orientation = (int)ConvertAnyFormat(ValuePtr, Format);
-        if (m_ExifInfo->Orientation < 0 || m_ExifInfo->Orientation > 8)
-        {
-          ErrNonfatal("Undefined rotation value %d", m_ExifInfo->Orientation, 0);
-          m_ExifInfo->Orientation = 0;
-        }
-      break;
-
-      case TAG_EXIF_IMAGELENGTH:
-      case TAG_EXIF_IMAGEWIDTH:
-        // Use largest of height and width to deal with images that have been
-        // rotated to portrait format.
-        {
-          int a = (int)ConvertAnyFormat(ValuePtr, Format);
-          if (m_ExifImageWidth < a) m_ExifImageWidth = a;
-        }
-      break;
-
-      case TAG_FOCALPLANEUNITS:
-        switch((int)ConvertAnyFormat(ValuePtr, Format))
-        {
-          // According to the information I was using, 2 means meters.
-          // But looking at the Cannon powershot's files, inches is the only
-          // sensible value.
-          case 1: m_FocalPlaneUnits = 25.4; break;  // inch
-          case 2: m_FocalPlaneUnits = 25.4; break;
-          case 3: m_FocalPlaneUnits = 10;   break;  // centimeter
-          case 4: m_FocalPlaneUnits = 1;    break;  // millimeter
-          case 5: m_FocalPlaneUnits = .001; break;  // micrometer
-        }
-      break;
-
-      case TAG_EXPOSURE_BIAS:
-        m_ExifInfo->ExposureBias = (float)ConvertAnyFormat(ValuePtr, Format);
-      break;
-
-      case TAG_WHITEBALANCE:
-        m_ExifInfo->Whitebalance = (int)ConvertAnyFormat(ValuePtr, Format);
-      break;
-
-      case TAG_LIGHT_SOURCE:
-        //Quercus: 17-1-2004 Added LightSource, some cams return this, whitebalance or both
-        m_ExifInfo->LightSource = (int)ConvertAnyFormat(ValuePtr, Format);
-      break;
-
-      case TAG_METERING_MODE:
-        m_ExifInfo->MeteringMode = (int)ConvertAnyFormat(ValuePtr, Format);
-      break;
-
-      case TAG_EXPOSURE_PROGRAM:
-        m_ExifInfo->ExposureProgram = (int)ConvertAnyFormat(ValuePtr, Format);
-      break;
-
-      case TAG_EXPOSURE_INDEX:
-        if (m_ExifInfo->ISOequivalent == 0)
-        {
-          // Exposure index and ISO equivalent are often used interchangeably,
-          // so we will do the same.
-          // http://photography.about.com/library/glossary/bldef_ei.htm
-          m_ExifInfo->ISOequivalent = (int)ConvertAnyFormat(ValuePtr, Format);
-        }
-      break;
-
-      case TAG_ISO_EQUIVALENT:
-        m_ExifInfo->ISOequivalent = (int)ConvertAnyFormat(ValuePtr, Format);
-        if (m_ExifInfo->ISOequivalent < 50)
-          m_ExifInfo->ISOequivalent *= 200;          // Fixes strange encoding on some older digicams.
-      break;
-
-      case TAG_EXPOSURE_MODE:
-        m_ExifInfo->ExposureMode = (int)ConvertAnyFormat(ValuePtr, Format);
-      break;
-
-      case TAG_DIGITALZOOMRATIO:
-        m_ExifInfo->DigitalZoomRatio = (float)ConvertAnyFormat(ValuePtr, Format);
-      break;
-
-      case TAG_EXIF_OFFSET:
-      case TAG_INTEROP_OFFSET:
-      {
-        const unsigned char* const SubdirStart = OffsetBase + Get32(ValuePtr, m_MotorolaOrder);
-        if (SubdirStart < OffsetBase || SubdirStart > OffsetBase+ExifLength)
-        {
-          ErrNonfatal("Illegal exif or interop ofset directory link",0,0);
-        }
-        else
-        {
-          ProcessDir(SubdirStart, OffsetBase, ExifLength, NestingLevel+1);
-        }
-        continue;
-      }
-      break;
-
-      case TAG_GPSINFO:
-      {
-        const unsigned char* const SubdirStart = OffsetBase + Get32(ValuePtr, m_MotorolaOrder);
-        if (SubdirStart < OffsetBase || SubdirStart > OffsetBase+ExifLength)
-        {
-          ErrNonfatal("Illegal GPS directory link",0,0);
-        }
-        else
-        {
-          ProcessGpsInfo(SubdirStart, ByteCount, OffsetBase, ExifLength);
-        }
-        continue;
-      }
-      break;
-
-      case TAG_FOCALLENGTH_35MM:
-        // The focal length equivalent 35 mm is a 2.2 tag (defined as of April 2002)
-        // if its present, use it to compute equivalent focal length instead of
-        // computing it from sensor geometry and actual focal length.
-        m_ExifInfo->FocalLength35mmEquiv = (unsigned)ConvertAnyFormat(ValuePtr, Format);
-      break;
-    }
-  }
-
-
-  // In addition to linking to subdirectories via exif tags,
-  // there's also a potential link to another directory at the end of each
-  // directory.  this has got to be the result of a committee!
-  unsigned Offset;
-
-  if (DIR_ENTRY_ADDR(DirStart, NumDirEntries) + 4 <= OffsetBase+ExifLength)
-  {
-    Offset = Get32(DirStart+2+12*NumDirEntries, m_MotorolaOrder);
-    if (Offset)
-    {
-      const unsigned char* const SubdirStart = OffsetBase + Offset;
-      if (SubdirStart > OffsetBase+ExifLength || SubdirStart < OffsetBase)
-      {
-        if (SubdirStart > OffsetBase && SubdirStart < OffsetBase+ExifLength+20)
-        {
-          // Jhead 1.3 or earlier would crop the whole directory!
-          // As Jhead produces this form of format incorrectness,
-          // I'll just let it pass silently
-        }
-        else
-        {
-          ErrNonfatal("Illegal subdirectory link",0,0);
-        }
-      }
-      else
-      {
-        if (SubdirStart <= OffsetBase+ExifLength)
-        {
-          ProcessDir(SubdirStart, OffsetBase, ExifLength, NestingLevel+1);
-        }
-      }
-      if (Offset > m_LargestExifOffset)
-      {
-        m_LargestExifOffset = Offset;
-      }
-    }
-  }
-  else
-  {
-    // The exif header ends before the last next directory pointer.
-  }
-
-  if (m_ExifInfo->ThumbnailOffset)
-  {
-    m_ExifInfo->ThumbnailAtEnd = false;
-
-    if (m_ExifInfo->ThumbnailOffset <= ExifLength)
-    {
-      if (m_ExifInfo->ThumbnailSize > ExifLength - m_ExifInfo->ThumbnailOffset)
-      {
-        // If thumbnail extends past exif header, only save the part that
-        // actually exists.  Canon's EOS viewer utility will do this - the
-        // thumbnail extracts ok with this hack.
-        m_ExifInfo->ThumbnailSize = ExifLength - m_ExifInfo->ThumbnailOffset;
-      }
-    }
-  }
-}
-
-
-//--------------------------------------------------------------------------
-// Process a EXIF marker
-// Describes all the drivel that most digital cameras include...
-//--------------------------------------------------------------------------
-bool CExifParse::Process (const unsigned char* const ExifSection, const unsigned short length, ExifInfo_t *info)
-{
-  m_ExifInfo = info;
-  // EXIF signature: "Exif\0\0"
-  // Check EXIF signatures
-  const char ExifHeader[]     = "Exif\0\0";
-  const char ExifAlignment0[] = "II";
-  const char ExifAlignment1[] = "MM";

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14135
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14135&view=rev
Author:   spiff_
Date:     2008-07-15 14:54:34 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
changed: compile librtv instead of keeping binary in svn (linux x86)

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.in

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/lib/libRTV/GuideParser.cpp
    branches/linuxport/XBMC/xbmc/lib/libRTV/Makefile
    branches/linuxport/XBMC/xbmc/lib/libRTV/Makefile.tiger
    branches/linuxport/XBMC/xbmc/lib/libRTV/crypt.c
    branches/linuxport/XBMC/xbmc/lib/libRTV/guideclient.c
    branches/linuxport/XBMC/xbmc/lib/libRTV/httpclient.c
    branches/linuxport/XBMC/xbmc/lib/libRTV/httpfsclient.c
    branches/linuxport/XBMC/xbmc/lib/libRTV/interface.c
    branches/linuxport/XBMC/xbmc/lib/libRTV/libRTV.sln
    branches/linuxport/XBMC/xbmc/lib/libRTV/libRTV.vcproj
    branches/linuxport/XBMC/xbmc/lib/libRTV/md5.c
    branches/linuxport/XBMC/xbmc/lib/libRTV/netclient.c
    branches/linuxport/XBMC/xbmc/lib/libRTV/rtv.c
    branches/linuxport/XBMC/xbmc/lib/libRTV/rtv.h
    branches/linuxport/XBMC/xbmc/lib/libRTV/sleep.c

Removed Paths:
-------------
    branches/linuxport/XBMC/xbmc/lib/libRTV/librtv-i486-linux.a
    branches/linuxport/XBMC/xbmc/lib/libRTV/rtv.h
    branches/linuxport/sources/librtv/GuideParser.cpp
    branches/linuxport/sources/librtv/Makefile
    branches/linuxport/sources/librtv/Makefile.tiger
    branches/linuxport/sources/librtv/crypt.c
    branches/linuxport/sources/librtv/guideclient.c
    branches/linuxport/sources/librtv/httpclient.c
    branches/linuxport/sources/librtv/httpfsclient.c
    branches/linuxport/sources/librtv/interface.c
    branches/linuxport/sources/librtv/libRTV.sln
    branches/linuxport/sources/librtv/libRTV.vcproj
    branches/linuxport/sources/librtv/md5.c
    branches/linuxport/sources/librtv/netclient.c
    branches/linuxport/sources/librtv/rtv.c
    branches/linuxport/sources/librtv/rtv.h
    branches/linuxport/sources/librtv/sleep.c

Modified: branches/linuxport/XBMC/Makefile.in
===================================================================
--- branches/linuxport/XBMC/Makefile.in	2008-07-15 21:52:16 UTC (rev 14134)
+++ branches/linuxport/XBMC/Makefile.in	2008-07-15 21:54:34 UTC (rev 14135)
@@ -88,6 +88,8 @@
 	$(MAKE) -C xbmc/lib/libXBMS
 libexif:
 	$(MAKE) -C xbmc/lib/libexif
+librtv:
+	$(MAKE) -C xbmc/lib/libRTV
 papcodecs:
 	$(MAKE) -C xbmc/cores/paplayer/AACCodec
 	$(MAKE) -C xbmc/cores/paplayer/AC3Codec
@@ -108,7 +110,7 @@
 	$(MAKE) -C xbmc/cores/paplayer/WavPackCodec
 	$(MAKE) -C xbmc/cores/paplayer/YMCodec
 	
-compile: guilib xbmc filesystem musicdatabase videodatabase cores paplayer dllloader exports xbox linux visualizations screensavers utils common tinyxml sqllite libscrobbler libgoahead unrarxlib libpython dvdplayer libupnp cdrip libcmyth librtmp libxbms libexif papcodecs
+compile: guilib xbmc filesystem musicdatabase videodatabase cores paplayer dllloader exports xbox linux visualizations screensavers utils common tinyxml sqllite libscrobbler libgoahead unrarxlib libpython dvdplayer libupnp cdrip libcmyth librtmp libxbms libexif librtv papcodecs
 
 xbmc.bin: $(wildcard xbmc/*.o xbmc/settings/*.o guilib/*.o guilib/tinyXML/*.o guilib/common/*.o xbmc/FileSystem/*.o xbmc/FileSystem/VideoDatabaseDirectory/*.o xbmc/FileSystem/MusicDatabaseDirectory/*.o xbmc/visualizations/*.o xbmc/screensavers/*.o xbmc/cores/*.o xbmc/cores/paplayer/*.o xbmc/linux/*.o xbmc/lib/sqLite/*.o xbmc/lib/libscrobbler/*.o xbmc/lib/libPython/*.o xbmc/lib/libPython/xbmcmodule/*.o xbmc/xbox/*.o xbmc/cores/DllLoader/*.o xbmc/cores/DllLoader/exports/*.o xbmc/cores/DllLoader/exports/util/*.o xbmc/utils/*.o xbmc/lib/UnrarXLib/*.o xbmc/lib/libGoAhead/*.o xbmc/cores/dvdplayer/*.o xbmc/cores/dvdplayer/DVDSubtitles/*.o xbmc/cores/dvdplayer/DVDInputStreams/*.o xbmc/cores/dvdplayer/DVDCodecs/*.o xbmc/cores/dvdplayer/DVDCodecs/Audio/*.o xbmc/cores/dvdplayer/DVDCodecs/Video/*.o xbmc/cores/dvdplayer/DVDCodecs/Overlay/*.o xbmc/cores/dvdplayer/DVDDemuxers/*.o xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc/*.o xbmc/cores/VideoRenderers/*.o xbmc/cores/VideoRenderers/VideoShaders/*.o xbmc/cdrip/*.o xbmc/lib/libcmyth/*.o xbmc/lib/libRTMP/*.o) xbmc/lib/libXBMS/libxbms-@... xbmc/lib/libUPnP/libupnp-@... 
 	g++ $(DEBUG_FLAGS) -o xbmc.bin xbmc/*.o xbmc/settings/*.o xbmc/cdrip/*.o guilib/*.o guilib/tinyXML/*.o guilib/common/*.o xbmc/FileSystem/*.o xbmc/FileSystem/VideoDatabaseDirectory/*.o xbmc/FileSystem/MusicDatabaseDirectory/*.o xbmc/visualizations/*.o xbmc/screensavers/*.o xbmc/cores/*.o xbmc/cores/paplayer/*.o xbmc/linux/*.o xbmc/lib/sqLite/*.o xbmc/lib/libscrobbler/*.o xbmc/lib/libPython/*.o xbmc/lib/libPython/xbmcmodule/*.o xbmc/xbox/*.o xbmc/cores/DllLoader/*.o xbmc/cores/DllLoader/exports/*.o xbmc/cores/DllLoader/exports/util/*.o xbmc/utils/*.o xbmc/lib/UnrarXLib/*.o xbmc/lib/libGoAhead/*.o xbmc/cores/dvdplayer/*.o xbmc/cores/dvdplayer/DVDSubtitles/*.o xbmc/cores/dvdplayer/DVDInputStreams/*.o xbmc/cores/dvdplayer/DVDCodecs/*.o xbmc/cores/dvdplayer/DVDCodecs/Audio/*.o xbmc/cores/dvdplayer/DVDCodecs/Video/*.o xbmc/cores/dvdplayer/DVDCodecs/Overlay/*.o xbmc/cores/dvdplayer/DVDDemuxers/*.o xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc/*.o xbmc/cores/VideoRenderers/*.o xbmc/cores/VideoRenderers/VideoShaders/*.o xbmc/lib/libcmyth/*.o xbmc/lib/libRTMP/*.o xbmc/lib/libGoAhead/libGoAheadD-@... xbmc/lib/libXBMS/libxbms-@... xbmc/lib/libUPnP/libupnp-@... xbmc/lib/libshout/libshout-@... xbmc/lib/libRTV/librtv-@... xbmc/lib/libXDAAP/libxdaap-@... xbmc/lib/libcdio/libcdio-@... xbmc/lib/libsmb/libsmbclient-@... $(LIBS) -rdynamic

Copied: branches/linuxport/XBMC/xbmc/lib/libRTV/GuideParser.cpp (from rev 14132, branches/linuxport/sources/librtv/GuideParser.cpp)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libRTV/GuideParser.cpp	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libRTV/GuideParser.cpp	2008-07-15 21:54:34 UTC (rev 14135)
@@ -0,0 +1,1591 @@
+#pragma code_seg( "RTV_TEXT" )
+#pragma data_seg( "RTV_DATA" )
+#pragma bss_seg( "RTV_BSS" )
+#pragma const_seg( "RTV_RD" )
+
+/*
+** ReplayTV 5000
+** Guide Parser
+** by Lee Thompson <thompsonl@...> Dan Frumin <rtv@...>, Todd Larason <jtl@...>
+**
+** This program is distributed in the hope that it will be useful, 
+** but WITHOUT ANY WARRANTY; without even the implied warranty of 
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+** 
+** If you distribute a modified version of this program, the program MUST tell the user 
+** in the usage summary how the program has been modified, and who performed the modification.
+** Modified source code MUST be distributed with the modified program. 
+**
+** For additional detail on the Replay 4000/4500/5000 internals, protocols and structures I highly recommend
+** visiting Todd's site: http://www.molehill.org/twiki/bin/view/Replay/WebHome
+**
+***************************************************************************************************************
+**
+** IMPORTANT NOTE: This is the last version of GuideParser with this codebase. 
+**
+** GuideParser was originally just a research project to learn the Guide Snapshot format.  This research
+** phase is pretty much at a close and this code is very ugly. 
+**
+** Others wishing to continue development of GuideParser with this code are welcome to do so under the above
+** limitations.
+**
+***************************************************************************************************************
+**
+** Revision History:
+** 
+** 1.02 - LT   Updated for 5.0 Software
+** 1.01 - LT   ReplayTV 5000
+** 1.0 - LT    Final version with this codebase.
+**             Organized the structures a bit better.
+**             Fixed some annoying bugs.
+**             Added -combined option which does a mini replayChannel lookup, best used with -ls
+** .11 - LT    Whoops!  ReplayChannel had the wrong number for szThemeInfo, should've been 64 not 60! (Thanks Clem!)
+**             Todd corrected a mis-assigned bitmask for TV rating "TV-G"
+**             Todd's been knocking himself out with research... as a result no more unknowns in tagProgramInfo!
+**             Added Genre lookups
+** .10 - LT    Works on FreeBSD now (thanks Andy!)  
+**             Fixed a minor display bug.   
+**             Supports MPAA "G" ratings.
+**             Added -d option for dumping unknowns as numbers.
+**             Added -x (Xtra) option for displaying TMSIDs and so forth.   
+**             Added -nowrap to supress word wrap.
+**             Added STDIN support!
+**             Added Input Source lookup.
+**             Better organized sub-structures. 
+**             Channel/Show Output now uses the word wrapper for everything.
+**             Some minor tweaks.
+**             Less unknowns.   (Thanks in large part to Todd)
+**             Released on Mar 10th 2002
+** .09 - LT    Wrote an int64 Big->Small Endian converter.   
+**             UNIX/WIN32 stuff sorted out.  
+**             Cleaned up some code.  
+**             Dependency on stdafx.h removed.
+**             Improved Word Wrapper.   
+**             Fixed some bugs.
+**             Less unknowns.
+**             Released on Jan 13th 2002
+** .08 - LT    More fixes!
+**             Better wordwrapping!
+**             Less unknowns!      
+**             Released on Jan 10th 2002
+** .07 - LT    Categories :)   
+**             Dan added the extraction command line switches and code.
+**             Released on Jan 8th 2002
+** .06 - LT	   Timezone fixes
+**             Released on Jan 5th 2002
+** .05 - LT    Checking to see if guide file is damaged (some versions of ReplayPC have a problem in this area)
+**			   Found a case where GuideHeader.replayshows is not accurate!   
+**             Lots of other fixes.
+**             Released on Jan 4th 2002
+** .04 - LT    Day of Week implemented.
+**             Categories are loaded but lookup isn't working.
+** .03 - LT	   Private build.
+** .02 - LT	   Private build.
+** .01 - LT    Private build.  
+**             Initial Version     
+**             01/03/2002
+**
+**
+***************************************************************************************************************
+**
+** TO DO:
+**
+** 1. Rewrite!
+**
+** 
+** BUGS
+**  Piping from replaypc to guideparser gets a few replaychannels in and somehow loses it's alignment -- looks
+**  like the 'file' is being truncated.
+**
+***************************************************************************************************************
+**  FreeBSD fixes by Andrew Tulloch <andrew@...>
+***************************************************************************************************************
+*/
+
+#ifdef _XBOX
+#include <Xtl.h>
+#pragma pack(1)                          // don't use byte alignments on the structs
+#endif
+
+#ifdef _WIN32
+#if !defined(AFX_STDAFX_H__11AD8D81_EA54_4CD0_9A74_44F7170DE43F__INCLUDED_)
+#define AFX_STDAFX_H__11AD8D81_EA54_4CD0_9A74_44F7170DE43F__INCLUDED_
+#endif
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#pragma pack(1)                          // don't use byte alignments on the structs
+
+#define WIN32_LEAN_AND_MEAN	
+
+#if defined (_WIN32) && !defined(_XBOX)
+#include <winsock2.h>
+#endif
+
+#include <winnt.h>
+#include <winbase.h>
+#endif
+
+#if defined(__unix__) && !defined(__FreeBSD__)
+#include <netinet/in.h>
+#endif
+
+#include <string.h>
+#include <memory.h>
+#include <math.h>
+#include <stdio.h>
+#include <time.h>
+#include <fcntl.h>
+
+#if defined (_WIN32) && !defined(_XBOX)
+#pragma comment(lib, "ws2_32.lib")      // load winsock2 (we only use it for endian conversion)
+#define FILEPOS fpos_t
+#endif
+
+#ifdef __APPLE__
+#include <AvailabilityMacros.h>
+#endif
+
+#ifdef __unix__
+typedef unsigned char BYTE;
+typedef unsigned long long DWORD64;
+typedef unsigned long DWORD;
+typedef unsigned short WORD;
+#define FILEPOS unsigned long
+#define _tzset() tzset()
+#define _tzname tzname
+#define _timezone timezone
+#define MoveMemory(dst,src,len) memmove(dst,src,len)
+#define HIWORD(x) (WORD)(x >> 16)
+#endif
+
+extern int _daylight;
+#if defined(__APPLE__) && (MAC_OS_X_VERSION_MAX_ALLOWED > 1040) 
+extern long _timezone;
+#endif
+extern char *_tzname[2];
+
+#define SHOWSTRUCTURESIZES  1           // this is for debugging...
+#undef SHOWSTRUCTURESIZES		        // ...uncomment this line for structure sizes to be shown
+
+// 5.0
+#define REPLAYSHOW      512             // needed size of replayshow structure
+#define GUIDEHEADER     840             // needed size of guideheader structure
+#define PROGRAMINFO     272             // needed size of programinfo structure
+#define CHANNELINFO     80              // needed size of channelinfo structure
+
+// 4.5
+#define GUIDEHEADER45   808             // needed size of guideheader structure
+
+// 4.3
+#define GUIDEHEADER43   808             // needed size of guideheader structure
+#define REPLAYSHOW43    444				// needed size of replayshow structure
+
+#define MAXCHANNELS     99
+
+#define lpszTitle	    "ReplayTV 5000 (Alpha) GuideParser v1.02 (Build 17)"
+#define lpszCopyright	"(C) 2002 Lee Thompson, Dan Frumin, Todd Larason, and Andrew Tulloch"
+#define lpszComment     ""
+
+//-------------------------------------------------------------------------
+// Data Structures
+//-------------------------------------------------------------------------
+
+//-------------------------------------------------------------------------
+//******************** COMMENTS *******************************************
+//-------------------------------------------------------------------------
+/*
+** General ReplayTV Notes
+**
+**  The RTV4K/5K platforms are capable of supporting NTSC, PAL and SECAM so
+**  in theory there may be one or more bytes always set a certain way as they
+**  reflect NTSC.
+**
+**  On the subject of recorded time: The ReplayTV units appear to 
+**  automatically pad shows by 3 seconds.   e.g. If you schedule a show that
+**  airs at 6:00 PM, the recording will  actually begin at 5:59:57 PM.
+**  Because of this, even an unpadded show will have a 3 second discrepency
+**  between ReplayShow.recorded and ReplayShow.eventtime.
+**
+**
+** Categories
+**
+**  There appears to be an *internal* maximum of 32 but the units appear
+**  to only use 17 total.
+** 
+** Secondary Offset (GuideHeader)
+**
+**  If you jump to this absolute location this repeats the first 12 bytes of 
+**  this header, null terminates and then 4 unknown DWORDs. 
+**
+**  You will then be at the first byte of the first ReplayChannel  record.
+**
+**
+** Genre Codes
+**  Todd Larason's been slowly figuring these out, you can see the list at
+**  http://www.molehill.org/twiki/bin/view/Replay/RnsGetCG2
+**
+*/
+
+/**************************************************************************
+**
+** GUIDE HEADER
+**
+**
+** Most of the  unknowns in the GuideHeader are garbage/junk.   Why 
+** these aren't initialized to null I have no idea.
+**
+** They may also be a memory structure that has no meaning on a 'remote unit'.
+**
+**************************************************************************/
+
+// 5000 OS Version 5.0
+typedef struct tagGuideSnapshotHeader { 
+    WORD osversion;             // OS Version (5 for 4.5, 3 for 4.3, 0 on 5.0)
+    WORD snapshotversion;       // Snapshot Version (1) (2 on 5.0)    This might be better termed as snapshot version
+    DWORD structuresize;		// Should always be 64
+    DWORD unknown1;		        // 0x00000002
+    DWORD unknown2;             // 0x00000005
+    DWORD channelcount;		    // Number of Replay Channels
+    DWORD channelcountcheck;    // Should always be equal to channelcount, it's incremented as the snapshot is built.
+    DWORD unknown3;             // 0x00000000
+    DWORD groupdataoffset;		// Offset of Group Data
+    DWORD channeloffset;		// Offset of First Replay Channel  (If you don't care about categories, jump to this)
+    DWORD showoffset;			// Offset of First Replay Show (If you don't care about ReplayChannels, jump to this)
+    DWORD snapshotsize;         // Total Size of the Snapshot
+    DWORD unknown4;             // 0x00000001
+    DWORD unknown5;             // 0x00000004
+    DWORD flags;	    		// Careful, this is uninitialized, ignore invalid bits
+    DWORD unknown6;             // 0x00000002
+    DWORD unknown7;             // 0x00000000
+} GuideSnapshotHeader;
+
+typedef struct tagGroupData {
+    DWORD structuresize;	    // Should always be 776
+    DWORD categories;			// Number of Categories (MAX: 32 [ 0 - 31 ] )
+    DWORD category[32];			// category lookup 2 ^ number, position order = text
+    DWORD categoryoffset[32];	// Offsets for the GuideHeader.catbuffer
+    char catbuffer[512];		// GuideHeader.categoryoffset contains the starting position of each category.
+} GroupData;
+
+typedef struct tagGuideHeader {
+    struct tagGuideSnapshotHeader GuideSnapshotHeader;
+    struct tagGroupData GroupData;
+} GuideHeader;
+
+// 4000 OS Version 4.3 / 5000 OS Version 4.5
+typedef struct tagGuideSnapshotHeader45 { 
+    WORD osversion;             // Major Revision (5 for Replay5000s, 3 for Replay 4000/4500s)
+    WORD snapshotversion;       // Minor Revision (1)
+    DWORD structuresize;		// Should always be 32
+    DWORD channelcount;			// Number of Replay Channels
+    DWORD channelcountcheck;	// Number of Replay Channels (Copy 2; should always match)
+    DWORD groupdataoffset;		// Offset of Group Data
+    DWORD channeloffset;		// Offset of First Replay Channel  (If you don't care about categories, jump to this)
+    DWORD showoffset;			// Offset of First Replay Show (If you don't care about ReplayChannels, jump to this)
+    DWORD flags;	    		// Careful, this is uninitialized, ignore invalid bits
+} GuideSnapshotHeader45; 
+
+// GroupData structure is the same for 4.3/4.5 and 5.0
+
+typedef struct tagGuideHeader45 {
+    struct tagGuideSnapshotHeader45 GuideSnapshotHeader;
+    struct tagGroupData GroupData;
+} GuideHeader45;
+
+/*******************************************************************************
+**
+** SUB-STRUCTURES
+**
+*******************************************************************************/
+
+//-------------------------------------------------------------------------
+// Movie Extended Info Structure
+
+typedef struct tagMovieInfo {
+    WORD mpaa;                 		// MPAA Rating
+    WORD stars;                		// Star Rating * 10  (i.e. value of 20 = 2 stars)
+    WORD year;                 		// Release Year
+    WORD runtime;              		// Strange HH:MM format
+} MovieInfo;
+
+
+//-------------------------------------------------------------------------
+// Has Parts Info Structure
+
+typedef struct tagPartsInfo {
+    WORD partnumber;           		// Part X [Of Y]
+    WORD maxparts;            		// [Part X] Of Y
+} PartsInfo;
+
+
+//--------------------------------------------------------------------------
+// Program Info Structure
+
+typedef struct tagProgramInfo { 
+    DWORD structuresize;		// Should always be 272 (0x0110)
+    DWORD autorecord;			// If non-zero it is an automatic recording, otherwise it is a manual recording.
+    DWORD isvalid;		    	// Not sure what it actually means! (should always be 1 in exported guide)
+    DWORD tuning;			    // Tuning (Channel Number) for the Program
+    DWORD flags;		    	// Program Flags 
+    DWORD eventtime;			// Scheduled Time of the Show
+    DWORD tmsID;			    // Tribune Media Services ID (inherited from ChannelInfo)
+    WORD minutes;			    // Minutes (add with show padding for total)
+    BYTE genre1;                // Genre Code 1
+    BYTE genre2;                // Genre Code 2
+    BYTE genre3;                // Genre Code 3
+    BYTE genre4;                // Genre Code 4
+    WORD recLen;      	        // Record Length of Description Block
+    BYTE titleLen;			    // Length of Title
+    BYTE episodeLen;		    // Length of Episode
+    BYTE descriptionLen;		// Length of Description
+    BYTE actorLen;			    // Length of Actors
+    BYTE guestLen;			    // Length of Guest
+    BYTE suzukiLen;			    // Length of Suzuki String (Newer genre tags)
+    BYTE producerLen;			// Length of Producer
+    BYTE directorLen;			// Length of Director
+    char szDescription[228];	// This can have parts/movie sub-structure
+} ProgramInfo;	
+
+
+//--------------------------------------------------------------------------
+// Channel Info Structure
+
+typedef struct tagChannelInfo {
+    DWORD structuresize;		// Should always be 80 (0x50)
+    DWORD usetuner;			    // If non-zero the tuner is used, otherwise it's a direct input.
+    DWORD isvalid;			    // Record valid if non-zero
+    DWORD tmsID;			    // Tribune Media Services ID
+    WORD channel;			    // Channel Number
+    BYTE device;			    // Device
+    BYTE tier;                  // Cable/Satellite Service Tier
+    char szChannelName[16];		// Channel Name
+    char szChannelLabel[32];	// Channel Description
+    char cablesystem[8];		// Cable system ID
+    DWORD channelindex;			// Channel Index (USUALLY tagChannelinfo.channel repeated)
+} ChannelInfo;
+
+
+/*******************************************************************************
+**
+** REPLAY SHOW
+**
+*******************************************************************************/
+
+typedef struct tagReplayShow { 
+    DWORD created;			        	// ReplayChannel ID (tagReplayChannel.created)
+    DWORD recorded;			        	// Filename/Time of Recording (aka ShowID)
+    DWORD inputsource;		        	// Replay Input Source
+    DWORD quality;			         	// Recording Quality Level
+    DWORD guaranteed;		    		// (0xFFFFFFFF if guaranteed)
+    DWORD playbackflags;	    		// Not well understood yet.
+    struct tagChannelInfo ChannelInfo;
+    struct tagProgramInfo ProgramInfo;
+    DWORD ivsstatus;		    		// Always 1 in a snapshot outside of a tagReplayChannel
+    DWORD guideid;		        		// The show_id on the original ReplayTV for IVS shows.  Otherwise 0
+    DWORD downloadid;   	    		// Valid only during actual transfer of index or mpeg file; format/meaning still unknown 
+    DWORD timessent;		    		// Times sent using IVS
+    DWORD seconds;		        		// Show Duration in Seconds (this is the exact actual length of the recording)
+    DWORD GOP_count;		    		// MPEG Group of Picture Count
+    DWORD GOP_highest;	     			// Highest GOP number seen, 0 on a snapshot.
+    DWORD GOP_last;		         		// Last GOP number seen, 0 on a snapshot.
+    DWORD checkpointed;	     			// 0 in possibly-out-of-date in-memory copies; always -1 in snapshots 
+    DWORD intact;				        // 0xffffffff in a snapshot; 0 means a deleted show 
+    DWORD upgradeflag;	    		    // Always 0 in a snapshot
+    DWORD instance;		    		    // Episode Instance Counter (0 offset)
+    WORD unused;	            		// Not preserved when padding values are set, presumably not used 
+    BYTE beforepadding;	    			// Before Show Padding
+    BYTE afterpadding;	    			// After Show Padding
+    DWORD64 indexsize;	          		// Size of NDX file (IVS Shows Only)
+    DWORD64 mpegsize;	    			// Size of MPG file (IVS Shows Only)
+    char szReserved[68];	    		// Show Label (NOT PRESENT in 4k 4.3 version, work around it)
+} ReplayShow;
+
+
+//-------------------------------------------------------------------------
+// WIN32 Functions
+//-------------------------------------------------------------------------
+
+#ifdef _WIN32
+
+//-------------------------------------------------------------------------
+void UnixTimeToFileTime(time_t t, LPFILETIME pft)
+{
+    LONGLONG ll;
+    
+    ll = Int32x32To64(t, 10000000) + 116444736000000000;
+    pft->dwLowDateTime = (DWORD)ll;
+    pft->dwHighDateTime = (DWORD)(ll >> 32);
+}
+
+
+//-------------------------------------------------------------------------
+void UnixTimeToSystemTime(time_t t, LPSYSTEMTIME pst)
+{
+    FILETIME ft;
+    
+    UnixTimeToFileTime(t, &ft);
+    FileTimeToSystemTime(&ft, pst);
+}
+
+//-------------------------------------------------------------------------
+char * UnixTimeToString(time_t t)
+{
+    static char sbuf[17];
+    char szTimeZone[32];
+    SYSTEMTIME st;
+    int tzbias;
+    
+    _tzset();
+    
+    memset(szTimeZone,0,sizeof(szTimeZone));
+    
+    MoveMemory(szTimeZone,_tzname[0],1);		
+    strcat(szTimeZone,"T");
+   
+#if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040)
+    struct timezone tz;
+    gettimeofday(NULL, &tz);
+    tzbias = tz.tz_minuteswest;
+#else
+    tzbias = _timezone;
+#endif
+    
+    UnixTimeToSystemTime(t - tzbias, &st);
+    sprintf(sbuf, "%d-%.2d-%.2d %.2d:%.2d:%.2d",
+        st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond);
+    return sbuf;
+}
+
+
+#endif
+
+//-------------------------------------------------------------------------
+// UNIX Functions
+//-------------------------------------------------------------------------
+
+#ifdef __unix__
+char * UnixTimeToString(time_t t)
+{
+    static char sbuf[17];
+    struct tm * tm;
+    
+    tm = localtime(&t);
+    strftime(sbuf, sizeof(sbuf), "%Y-%m-%d %H:%M:%S", tm);
+    return sbuf;
+}
+#endif
+
+
+//-------------------------------------------------------------------------
+// Common Functions
+//-------------------------------------------------------------------------
+
+
+//-------------------------------------------------------------------------
+// Lookup Tables
+//-------------------------------------------------------------------------
+
+//-------------------------------------------------------------------------
+void DisplayQuality(int quality, char *szQuality)
+{
+    switch( quality )	
+    {
+    case 0:
+        strcpy( szQuality, "High" );
+        break;
+    case 1:
+        strcpy( szQuality, "Medium" );
+        break;
+    case 2:
+        strcpy( szQuality, "Standard" );
+        break;
+    default:
+        strcpy( szQuality, "" );
+        break;
+    }
+}
+
+//-------------------------------------------------------------------------
+void DisplayExtendedTVRating(int tvrating, char *szRating, bool append)
+{
+
+    if (append == false)
+    {
+        strcpy( szRating, "");
+    }
+    
+    if (tvrating &  0x00020000)
+    {
+        if (strlen(szRating) > 0)
+        {
+            strcat( szRating, " ");
+        }
+
+
+        strcat( szRating, "S" );    // Sex
+    }
+    
+    if (tvrating &  0x00040000)
+    {
+        if (strlen(szRating) > 0)
+        {
+            strcat( szRating, " ");
+        }
+
+
+        strcat( szRating, "V" );    // Violence
+    }
+    
+    if (tvrating &  0x00080000)
+    {
+        if (strlen(szRating) > 0)
+        {
+            strcat( szRating, " ");
+        }
+
+
+        strcat( szRating, "L" );    // Language
+    }
+    
+    if (tvrating &  0x00100000)
+    {
+        if (strlen(szRating) > 0)
+        {
+            strcat( szRating, " ");
+        }
+
+
+        strcat( szRating, "D" );    // Drug Use
+    }
+    
+    if (tvrating &  0x00200000)
+    {
+        if (strlen(szRating) > 0)
+        {
+            strcat( szRating, " ");
+        }
+
+
+        strcat( szRating, "F" );    // Fantasy Violence
+    }
+    
+}
+
+//-------------------------------------------------------------------------
+void DisplayTVRating(int tvrating, char *szRating)
+{
+    strcpy( szRating, "");
+    
+    if (tvrating &  0x00008000)
+    {
+        strcpy( szRating, "TV-Y" );
+    }
+    
+    if (tvrating &  0x00010000)
+    {
+        strcpy( szRating, "TV-Y7" );
+    }
+    
+    if (tvrating &  0x00001000)
+    {
+        strcpy( szRating, "TV-G" );
+    }
+    
+    if (tvrating &  0x00004000)
+    {
+        strcpy( szRating, "TV-PG" );
+    }
+    
+    if (tvrating &  0x00002000)
+    {
+        strcpy( szRating, "TV-MA" );
+    }
+    
+    if (tvrating &  0x00000800)
+    {
+        strcpy( szRating, "TV-14" );
+    }
+    
+}
+
+//-------------------------------------------------------------------------
+void DisplayExtendedMPAARating(int mpaarating, char *szRating, bool append)
+{
+    if (append == false)
+    {
+        strcpy( szRating, "");
+    }
+    
+    if (mpaarating & 0x00400000)
+    {
+        if (strlen(szRating) > 0)
+        {
+            strcat( szRating, " ");
+        }
+
+        strcat( szRating, "AC" );    // Adult Content
+    }
+
+    if (mpaarating & 0x00800000)
+    {
+        if (strlen(szRating) > 0)
+        {
+            strcat( szRating, " ");
+        }
+
+        strcat( szRating, "BN" );   // Brief Nudity
+    }
+
+    if (mpaarating & 0x01000000)
+    {
+        if (strlen(szRating) > 0)
+        {
+            strcat( szRating, " ");
+        }
+
+        strcat( szRating, "GL" );   // Graphic Language
+    }
+
+    if (mpaarating & 0x02000000)
+    {
+        if (strlen(szRating) > 0)
+        {
+            strcat( szRating, " ");
+        }
+
+        strcat( szRating, "GV" );   // Graphic Violence
+    }
+
+    if (mpaarating & 0x04000000)
+    {
+        if (strlen(szRating) > 0)
+        {
+            strcat( szRating, " ");
+        }
+
+        strcat( szRating, "AL" );   // Adult Language
+    }
+
+    if (mpaarating & 0x08000000)
+    {
+        if (strlen(szRating) > 0)
+        {
+            strcat( szRating, " ");
+        }
+
+        strcat( szRating, "MV" );   // Mild Violence
+    }
+
+    if (mpaarating & 0x10000000)
+    {
+        if (strlen(szRating) > 0)
+        {
+            strcat( szRating, " ");
+        }
+
+        strcat( szRating, "N" );    // Nudity
+    }
+
+    if (mpaarating & 0x20000000)
+    {
+        if (strlen(szRating) > 0)
+        {
+            strcat( szRating, " ");
+        }
+
+        strcat( szRating, "RP" );   // Rape
+    }
+
+    if (mpaarating & 0x40000000)
+    {
+        if (strlen(szRating) > 0)
+        {
+            strcat( szRating, " ");
+        }
+
+        strcat( szRating, "SC " );   // Sexual Content
+    }
+
+    if (mpaarating & 0x80000000)
+    {
+        if (strlen(szRating) > 0)
+        {
+            strcat( szRating, " ");
+        }
+
+        strcat( szRating, "V" );    // Violence
+    }
+
+}
+
+
+//-------------------------------------------------------------------------
+void DisplayMPAARating(int mpaarating, char *szRating)
+{
+    strcpy( szRating, "");
+
+    if (mpaarating & 0x00000001)
+    {
+        strcat( szRating, "AO" );       // unverified
+    }
+
+    if (mpaarating & 0x00000002)
+    {
+        strcat( szRating, "G" );   
+    }
+
+    if (mpaarating & 0x00000004)
+    {
+        strcat( szRating, "NC-17" );    
+    }
+
+    if (mpaarating & 0x00000008)
+    {
+        strcat( szRating, "NR" );   
+    }
+
+    if (mpaarating & 0x00000010)
+    {
+        strcat( szRating, "PG" );   
+    }
+
+    if (mpaarating & 0x00000020)
+    {
+        strcat( szRating, "PG-13" );   
+    }
+
+    if (mpaarating & 0x00000040)
+    {
+        strcat( szRating, "R" );   
+    }
+
+}
+
+//-------------------------------------------------------------------------
+// Data Presentation Functions
+//-------------------------------------------------------------------------
+
+//-------------------------------------------------------------------------
+void ConvertCodepage(char *szString)
+{
+    bool exitloop = false;
+    unsigned int i = 0;
+    char ch;
+    
+    if (szString[0] == 0) 
+    {
+        return;
+    }
+    
+    for( i = 0; i < strlen(szString); ++i )
+    {
+        ch = szString[i];   
+        
+        // Windows Codepage Translation to DOS/UNIX etc
+        
+        if (ch == (char)146)
+        {
+            szString[i] = '\'';
+        }
+        
+        if (ch == (char)147)
+        {
+            szString[i] = '\"';
+        }
+        
+        if (ch == (char)148)
+        {
+            szString[i] = '\"';
+        }
+
+        
+#ifdef _WIN32
+        // Windows (Console) specific translations         
+#endif
+        
+#ifdef __unix__
+        // UNIX specific translations         
+#endif
+        
+    }
+    
+    return;
+    
+}
+
+//-------------------------------------------------------------------------
+// Misc. Functions
+//-------------------------------------------------------------------------
+
+//-------------------------------------------------------------------------
+int CalculateMinutes( int seconds )
+{
+    int original = seconds;
+    int retval = 0;
+    double result1 = 0.0;
+    double result2 = 0.0;
+    
+    if (seconds < 1) 
+    {
+        return 0;
+    }
+    
+    result1 = seconds / 60;
+    result2 = seconds % 60;
+    
+    if (result2 > .0)                   // this will round up if there's any remainder, 
+        // could also make this .5 etc
+    {
+        retval = (int)result1 + 1;
+    }
+    else
+    {
+        retval = (int)result1;
+    }
+    
+    return retval;
+    
+}
+
+//-------------------------------------------------------------------------
+// ENDIAN CONVERSION FUNCTIONS
+//-------------------------------------------------------------------------
+
+//-------------------------------------------------------------------------
+// LONGLONG/INT64 Endian Conversion
+//-------------------------------------------------------------------------
+
+//-------------------------------------------------------------------------
+DWORD64 ntohll(DWORD64 llValue)
+{
+    DWORD64 retval = 0;
+
+    // This is really cheesy but it works so that's all that matters 
+    // If someone out there wants to replace this with something cooler,
+    // please feel free to do so!
+
+    char szBuffer[17];
+    char szInt64[17];
+
+    memset(szBuffer,0,sizeof(szBuffer));
+    memset(szInt64,0,sizeof(szInt64));
+
+    MoveMemory(szBuffer,&llValue,sizeof(llValue));
+            
+    int cc = sizeof(llValue) - 1;
+    int i = 0;
+            
+    for( i = 0; i < sizeof(llValue); ++i )
+    {
+        szInt64[i] = szBuffer[cc];
+        --cc;
+    }
+            
+    MoveMemory(&retval,szInt64,sizeof(retval));
+
+    return retval;
+}
+
+//-------------------------------------------------------------------------
+void ConvertProgramInfoEndian(struct tagProgramInfo * strProgramInfo)
+{
+
+    strProgramInfo->autorecord = ntohl(strProgramInfo->autorecord);
+    strProgramInfo->eventtime = ntohl(strProgramInfo->eventtime);
+    strProgramInfo->flags = ntohl(strProgramInfo->flags);
+    strProgramInfo->isvalid = ntohl(strProgramInfo->isvalid);
+    strProgramInfo->minutes = ntohs(strProgramInfo->minutes);
+    strProgramInfo->recLen = ntohs(strProgramInfo->recLen);
+    strProgramInfo->structuresize = ntohl(strProgramInfo->structuresize);
+    strProgramInfo->tuning = ntohl(strProgramInfo->tuning);
+    strProgramInfo->tmsID = ntohl(strProgramInfo->tmsID);
+
+    return;
+}
+
+//-------------------------------------------------------------------------
+void ConvertMovieInfoEndian(struct tagMovieInfo * strMovieInfo)
+{
+    strMovieInfo->mpaa = ntohs(strMovieInfo->mpaa);
+    strMovieInfo->runtime = ntohs(strMovieInfo->runtime);
+    strMovieInfo->stars = ntohs(strMovieInfo->stars);
+    strMovieInfo->year = ntohs(strMovieInfo->year);
+
+    return;
+}
+
+//-------------------------------------------------------------------------
+void ConvertPartsInfoEndian(struct tagPartsInfo * strPartsInfo)
+{
+    strPartsInfo->maxparts = ntohs(strPartsInfo->maxparts);
+    strPartsInfo->partnumber = ntohs(strPartsInfo->partnumber);
+
+    return;
+}
+//-------------------------------------------------------------------------
+void ConvertReplayShowEndian(struct tagReplayShow * strReplayShow)
+{
+    strReplayShow->checkpointed = ntohl(strReplayShow->checkpointed);
+    strReplayShow->created = ntohl(strReplayShow->created);
+    strReplayShow->downloadid = ntohl(strReplayShow->downloadid);
+    strReplayShow->GOP_count = ntohl(strReplayShow->GOP_count);    
+    strReplayShow->GOP_highest = ntohl(strReplayShow->GOP_highest);    
+    strReplayShow->GOP_last = ntohl(strReplayShow->GOP_last);    
+    strReplayShow->guaranteed = ntohl(strReplayShow->guaranteed);
+    strReplayShow->guideid = ntohl(strReplayShow->guideid);
+    strReplayShow->indexsize = ntohll(strReplayShow->indexsize);
+    strReplayShow->inputsource = ntohl(strReplayShow->inputsource);
+    strReplayShow->instance = ntohl(strReplayShow->instance);
+    strReplayShow->intact = ntohl(strReplayShow->intact);
+    strReplayShow->ivsstatus = ntohl(strReplayShow->ivsstatus);
+    strReplayShow->mpegsize = ntohll(strReplayShow->mpegsize);
+    strReplayShow->playbackflags = ntohl(strReplayShow->playbackflags);
+    strReplayShow->quality = ntohl(strReplayShow->quality);
+    strReplayShow->recorded = ntohl(strReplayShow->recorded);
+    strReplayShow->seconds = ntohl(strReplayShow->seconds);
+    strReplayShow->timessent = ntohl(strReplayShow->timessent);
+    strReplayShow->upgradeflag = ntohl(strReplayShow->upgradeflag);
+    strReplayShow->unused = ntohs(strReplayShow->unused);
+
+    return;
+}
+
+//-------------------------------------------------------------------------
+void ConvertReplayGuideEndian(struct tagGuideHeader * strGuideHeader)
+{
+    
+    strGuideHeader->GroupData.categories = ntohl(strGuideHeader->GroupData.categories);
+    strGuideHeader->GroupData.structuresize = ntohl(strGuideHeader->GroupData.structuresize);
+
+    strGuideHeader->GuideSnapshotHeader.snapshotsize = ntohl(strGuideHeader->GuideSnapshotHeader.snapshotsize);
+    strGuideHeader->GuideSnapshotHeader.channeloffset = ntohl(strGuideHeader->GuideSnapshotHeader.channeloffset);
+    strGuideHeader->GuideSnapshotHeader.flags = ntohl(strGuideHeader->GuideSnapshotHeader.flags);
+    strGuideHeader->GuideSnapshotHeader.groupdataoffset = ntohl(strGuideHeader->GuideSnapshotHeader.groupdataoffset);
+    strGuideHeader->GuideSnapshotHeader.osversion = ntohs(strGuideHeader->GuideSnapshotHeader.osversion);
+    strGuideHeader->GuideSnapshotHeader.snapshotversion = ntohs(strGuideHeader->GuideSnapshotHeader.snapshotversion);
+    strGuideHeader->GuideSnapshotHeader.channelcount = ntohl(strGuideHeader->GuideSnapshotHeader.channelcount);
+    strGuideHeader->GuideSnapshotHeader.channelcountcheck = ntohl(strGuideHeader->GuideSnapshotHeader.channelcountcheck);
+    strGuideHeader->GuideSnapshotHeader.showoffset = ntohl(strGuideHeader->GuideSnapshotHeader.showoffset);
+
+    strGuideHeader->GuideSnapshotHeader.unknown1 = ntohl(strGuideHeader->GuideSnapshotHeader.unknown1);
+    strGuideHeader->GuideSnapshotHeader.unknown2 = ntohl(strGuideHeader->GuideSnapshotHeader.unknown2);
+    strGuideHeader->GuideSnapshotHeader.unknown3 = ntohl(strGuideHeader->GuideSnapshotHeader.unknown3);
+    strGuideHeader->GuideSnapshotHeader.unknown4 = ntohl(strGuideHeader->GuideSnapshotHeader.unknown4);
+    strGuideHeader->GuideSnapshotHeader.unknown5 = ntohl(strGuideHeader->GuideSnapshotHeader.unknown5);
+    strGuideHeader->GuideSnapshotHeader.unknown6 = ntohl(strGuideHeader->GuideSnapshotHeader.unknown6);
+    strGuideHeader->GuideSnapshotHeader.unknown7 = ntohl(strGuideHeader->GuideSnapshotHeader.unknown7);
+
+    for( unsigned int cc = 0; cc < strGuideHeader->GroupData.categories; ++cc )
+    {
+        strGuideHeader->GroupData.category[cc] = ntohl(strGuideHeader->GroupData.category[cc]);
+        strGuideHeader->GroupData.categoryoffset[cc] = ntohl(strGuideHeader->GroupData.categoryoffset[cc]);
+    }
+    
+
+    {
+        strGuideHeader->GuideSnapshotHeader.structuresize = ntohl(strGuideHeader->GuideSnapshotHeader.structuresize);
+    }
+
+    return;
+}
+
+//-------------------------------------------------------------------------
+void ConvertReplayGuide45To50Endian(struct tagGuideHeader45 * strGuideHeader45, struct tagGuideHeader * strGuideHeader)
+{
+    
+    strGuideHeader->GroupData.categories = ntohl(strGuideHeader45->GroupData.categories);
+    strGuideHeader->GroupData.structuresize = ntohl(strGuideHeader45->GroupData.structuresize);
+
+    strGuideHeader->GuideSnapshotHeader.snapshotsize = 0;
+    strGuideHeader->GuideSnapshotHeader.channeloffset = ntohl(strGuideHeader45->GuideSnapshotHeader.channeloffset);
+    strGuideHeader->GuideSnapshotHeader.flags = ntohl(strGuideHeader45->GuideSnapshotHeader.flags);
+    strGuideHeader->GuideSnapshotHeader.groupdataoffset = ntohl(strGuideHeader45->GuideSnapshotHeader.groupdataoffset);
+    strGuideHeader->GuideSnapshotHeader.osversion = ntohs(strGuideHeader45->GuideSnapshotHeader.osversion);
+    strGuideHeader->GuideSnapshotHeader.snapshotversion = ntohs(strGuideHeader45->GuideSnapshotHeader.snapshotversion);
+    strGuideHeader->GuideSnapshotHeader.channelcount = ntohl(strGuideHeader45->GuideSnapshotHeader.channelcount);
+    strGuideHeader->GuideSnapshotHeader.channelcountcheck = ntohl(strGuideHeader45->GuideSnapshotHeader.channelcountcheck);
+    strGuideHeader->GuideSnapshotHeader.showoffset = ntohl(strGuideHeader45->GuideSnapshotHeader.showoffset);
+
+    strGuideHeader->GuideSnapshotHeader.unknown1 = 0;
+    strGuideHeader->GuideSnapshotHeader.unknown2 = 0;
+    strGuideHeader->GuideSnapshotHeader.unknown3 = 0;
+    strGuideHeader->GuideSnapshotHeader.unknown4 = 0;
+    strGuideHeader->GuideSnapshotHeader.unknown5 = 0;
+    strGuideHeader->GuideSnapshotHeader.unknown6 = 0;
+    strGuideHeader->GuideSnapshotHeader.unknown7 = 0;
+
+    for( unsigned int cc = 0; cc < strGuideHeader->GroupData.categories; ++cc )
+    {
+        strGuideHeader->GroupData.category[cc] = ntohl(strGuideHeader45->GroupData.category[cc]);
+        strGuideHeader->GroupData.categoryoffset[cc] = ntohl(strGuideHeader45->GroupData.categoryoffset[cc]);
+    }
+    
+
+    {
+        strGuideHeader->GuideSnapshotHeader.structuresize = ntohl(strGuideHeader45->GuideSnapshotHeader.structuresize);
+    }
+
+    return;
+}
+
+//-------------------------------------------------------------------------
+// GuideParser
+//-------------------------------------------------------------------------
+
+extern "C" {
+int GuideParser(char * szOutputBuffer, const char * szInput, const size_t InputSize)
+{
+    const char * fptr, * junkptr;
+    bool moreshows, receivedshow;
+    bool isguaranteed, isrepeat, isletterbox, ismovie, hasparts, iscc, isppv, isstereo, issap;
+    char szBuffer[1024], szQuality[16];
+    char szEpisodeTitle[128];
+    char szStarRating[6], szMPAARating[10], szOriginalDescriptionBuffer[226];
+    char szTVRating[32];
+    char szShowTitle[128];
+    char szExtTV[64];
+    char szExtMPAA[64];
+    int i, curshow, cc;
+	size_t readsize;
+    ReplayShow strReplayShow;
+    GuideHeader strGuideHeader;
+    GuideHeader45 strGuideHeader45;
+    MovieInfo strMovieInfo;
+    PartsInfo strPartsInfo; 
+    
+    // Initialize
+    
+    memset(szBuffer,0,sizeof(szBuffer));
+    memset(szQuality,0,sizeof(szQuality));
+    memset(szEpisodeTitle,0,sizeof(szEpisodeTitle));
+    memset(szOriginalDescriptionBuffer,0,sizeof(szOriginalDescriptionBuffer));
+    memset(szStarRating,0,sizeof(szStarRating));
+    memset(szMPAARating,0,sizeof(szMPAARating));
+    memset(szExtTV,0,sizeof(szExtTV));
+    memset(szExtMPAA,0,sizeof(szExtMPAA));
+	sprintf(szOutputBuffer,"");
+
+    // Display Initial Header
+    
+    //printf("%s\n",lpszTitle);
+    //printf("%s\n\n",lpszCopyright);
+    //printf("%s\n",lpszComment);
+    
+    // Structure Sizes
+
+#ifdef SHOWSTRUCTURESIZES
+
+    //printf("struct strGuideHeader is %d bytes\n",sizeof(tagGuideHeader));
+    //printf("struct strMovieInfo is %d bytes\n",sizeof(tagMovieInfo));
+    //printf("struct strPartsInfo is %d bytes\n",sizeof(tagPartsInfo));
+    //printf("struct strProgramInfo is %d bytes\n",sizeof(tagProgramInfo));
+    //printf("struct strChannelInfo is %d bytes\n",sizeof(tagChannelInfo));
+    //printf("struct strReplayShow is %d bytes\n",sizeof(tagReplayShow));
+    //printf("\n");
+#endif
+
+#ifdef _DEBUG
+    // Check to make sure structures are required sizes, this is mostly for those of you tinkering with this
+    // and - of course - me :).
+
+    if (sizeof(ProgramInfo) != PROGRAMINFO)
+    {
+        //printf("Error in ProgramInfo structure, needs to be %u instead of %u\n",PROGRAMINFO,sizeof(ProgramInfo));
+    }
+
+    if (sizeof(ChannelInfo) != CHANNELINFO)
+    {
+        //printf("Error in ChannelInfo structure, needs to be %u instead of %u\n",CHANNELINFO,sizeof(ChannelInfo));
+    }
+
+    
+    if (sizeof(ReplayShow) != REPLAYSHOW)
+    {
+        //printf("Error in ReplayShow structure, needs to be %u instead of %u\n",REPLAYSHOW,sizeof(ReplayShow));
+    }
+    
+    if (sizeof(GuideHeader) != GUIDEHEADER)
+    {
+        //printf("Error in GuideHeader structure, needs to be %u instead of %u\n",GUIDEHEADER,sizeof(GuideHeader));
+    }
+
+	// 4.5
+    if (sizeof(GuideHeader45) != GUIDEHEADER45)
+    {
+        //printf("Error in GuideHeader45 structure, needs to be %u instead of %u\n",GUIDEHEADER45,sizeof(GuideHeader45));
+    }
+#endif
+
+    curshow = 0;
+    i = 0;
+    junkptr = szInput;
+    fptr = szInput;
+
+	DWORD ver;
+
+	memcpy(&ver, fptr, sizeof(ver));
+	ver = ntohl(ver);
+	//printf("V %d.%d!\n", HIWORD(ver), LOWORD(ver));
+
+    //-------------------------------------------------------------------------
+    // Replay Header
+    //-------------------------------------------------------------------------
+
+    //printf("Reading ReplayTV Guide Header\n");
+
+	switch(HIWORD(ver))
+	{
+		case 0:	// 5k 5.0
+			memcpy( &strGuideHeader, fptr, sizeof(strGuideHeader) );
+			ConvertReplayGuideEndian(&strGuideHeader);
+			break;
+		case 3: // 4k 4.3
+		case 5: // 5k 4.5
+			memcpy( &strGuideHeader45, fptr, sizeof(strGuideHeader45) );
+			ConvertReplayGuide45To50Endian(&strGuideHeader45, &strGuideHeader);
+			break;
+		default: // Unknown: try 5k 5.0
+			//printf("Unknown ReplayTV version: %d.%d!\n", HIWORD(ver), LOWORD(ver));
+			memcpy( &strGuideHeader, fptr, sizeof(strGuideHeader) );
+			ConvertReplayGuideEndian(&strGuideHeader);
+			break;
+	}
+
+    if (strGuideHeader.GuideSnapshotHeader.channelcount != strGuideHeader.GuideSnapshotHeader.channelcountcheck) 
+    {
+        //printf("Guide Snapshot might be damaged. (%u/%u)\n",strGuideHeader.GuideSnapshotHeader.channelcount,strGuideHeader.GuideSnapshotHeader.channelcountcheck);
+    }
+    
+    // jump to the first show record
+    
+    // fptr = (long)strGuideHeader.GuideSnapshotHeader.showoffset + junkptr; 
+    fptr = (long)strGuideHeader.GuideSnapshotHeader.showoffset + junkptr;
+            
+    //-------------------------------------------------------------------------
+    // ReplayShows
+    //-------------------------------------------------------------------------
+    
+    
+    //printf("\n\nReading ReplayShows\n\n");
+    
+    moreshows = true;
+    curshow = 0;
+
+	strcat(szOutputBuffer, "<REPLAYGUIDE>\n");
+    do
+    {
+		readsize = sizeof(strReplayShow);
+		// 4k 4.3 doesn't have the extra bytes for szReserved at the end of the struct
+		if ( HIWORD( ver ) == 3 ) readsize -= sizeof(strReplayShow.szReserved);
+
+		// Need to check if ptr is at, beyond or near end of input (i.e. within sizeof(strReplayshow))
+        if ( (InputSize - (fptr - szInput) ) < readsize)
+        {
+            moreshows = false;
+        }
+        else
+        {
+			memcpy( &strReplayShow, fptr, readsize);
+
+            curshow++;
+            
+            memset(szTVRating,0,sizeof(szTVRating));
+            memset(szBuffer,0,sizeof(szBuffer));
+            memset(szEpisodeTitle,0,sizeof(szEpisodeTitle));
+            memset(szShowTitle,0,sizeof(szShowTitle));
+            memset(szMPAARating,0,sizeof(szMPAARating));
+            memset(szOriginalDescriptionBuffer,0,sizeof(szOriginalDescriptionBuffer));
+            strcpy(szStarRating,"*****");
+            memset(szExtTV,0,sizeof(szExtTV));
+            memset(szExtMPAA,0,sizeof(szExtMPAA));
+
+            // Convert Endian
+
+            ConvertReplayShowEndian(&strReplayShow);
+            ConvertProgramInfoEndian(&strReplayShow.ProgramInfo);
+
+            /*
+            // this is for this hack, this seems to be no longer used so copy it from eventtime
+
+            if (strReplayShow.recorded == 0) {
+                    strReplayShow.recorded = strReplayShow.ProgramInfo.eventtime;
+            }
+            */
+            
+            // Process ProgramInfo
+
+            MoveMemory(szOriginalDescriptionBuffer,strReplayShow.ProgramInfo.szDescription,sizeof(szOriginalDescriptionBuffer));
+
+            // Process Flags 
+            
+            iscc = false;
+            issap = false;
+            isstereo = false;
+            ismovie = false;
+            isppv = false;
+            hasparts = false;
+            isletterbox = false;
+            isrepeat = false;   
+            receivedshow = false;
+            isguaranteed = false;
+            cc = 0;                         // Offset for Extended Data
+
+            if (strReplayShow.guaranteed == 0xFFFFFFFF) 
+            {
+                isguaranteed = true;
+            }
+
+            if (strReplayShow.guideid != 0)
+            {
+                receivedshow = true;
+            }
+            
+
+            if (strReplayShow.ProgramInfo.flags & 0x00000001) 
+            {
+                iscc = true;
+            }
+
+            if (strReplayShow.ProgramInfo.flags & 0x00000002) 
+            {
+                isstereo = true;
+            }
+
+            if (strReplayShow.ProgramInfo.flags & 0x00000004) 
+            {
+                isrepeat = true;
+            }
+
+            if (strReplayShow.ProgramInfo.flags & 0x00000008) 
+            {
+                issap = true;
+            }
+            
+            if (strReplayShow.ProgramInfo.flags & 0x00000010) 
+            {
+                isletterbox = true;
+            }
+            
+            if (strReplayShow.ProgramInfo.flags & 0x00000020) 
+            {
+                // Movie, load extra 8 bytes into MovieInfo structure.
+                
+                ismovie = true;
+                MoveMemory(&strMovieInfo,szOriginalDescriptionBuffer + cc,sizeof(strMovieInfo));
+                ConvertMovieInfoEndian(&strMovieInfo);
+                
+                memset(szBuffer,0,sizeof(szBuffer));
+                cc =  cc + sizeof(strMovieInfo);
+                MoveMemory(szBuffer,szOriginalDescriptionBuffer + cc,sizeof(szOriginalDescriptionBuffer) - cc);
+                
+                // this won't do the half stars, it's too cheesy for that!
+                
+                i = strMovieInfo.stars / 10;
+                szStarRating[i] = 0;
+                
+                // MPAA Rating 
+                
+                DisplayMPAARating(strMovieInfo.mpaa,szMPAARating);
+                DisplayExtendedMPAARating(strMovieInfo.mpaa,szExtMPAA,false);
+                
+                if (strlen(szMPAARating) > 0) 
+                {
+                    if (strlen(szExtMPAA) > 0)
+                    {
+                        strcat( szMPAARating, " (" );
+                        strcat( szMPAARating, szExtMPAA );
+                        strcat( szMPAARating, ")" );
+                    }
+				}
+			}
+            
+            
+            if (strReplayShow.ProgramInfo.flags & 0x00000040) 
+            {
+                
+                // Multiple Parts
+                
+                hasparts = true;
+                MoveMemory(&strPartsInfo,szOriginalDescriptionBuffer + cc,sizeof(strPartsInfo));
+                ConvertPartsInfoEndian(&strPartsInfo);
+                
+                memset(szBuffer,0,sizeof(szBuffer));
+                
+                cc = cc + sizeof(strPartsInfo);
+                MoveMemory(szBuffer,szOriginalDescriptionBuffer + cc,sizeof(szOriginalDescriptionBuffer) - cc);
+            }
+
+            if (strReplayShow.ProgramInfo.flags & 0x00000080) 
+            {
+                isppv = true;
+            }
+            
+            if (!ismovie)
+            {
+                /*
+                **
+                ** NOTE: 
+                ** This is what the Replay does.  However, the TMS data does support a mix
+                ** so, if you want, you can remove "if (!ismovie)".
+                */
+
+                DisplayTVRating(strReplayShow.ProgramInfo.flags,szTVRating);
+                DisplayExtendedTVRating(strReplayShow.ProgramInfo.flags,szExtTV,false);
+            }
+
+            if (strlen(szTVRating) > 0) 
+            {
+                if (strlen(szExtTV) > 0)
+                {
+                    strcat( szTVRating, " (" );
+                    strcat( szTVRating, szExtTV );
+                    strcat( szTVRating, ")" );
+                }
+            }
+
+
+            
+            i = cc;             // set offset (needed if it's been mangled by HasParts or IsMovie)           
+            
+            strncpy(szShowTitle,strReplayShow.ProgramInfo.szDescription + i,strReplayShow.ProgramInfo.titleLen);
+            i = i + strReplayShow.ProgramInfo.titleLen;
+            
+            strncpy(szEpisodeTitle,strReplayShow.ProgramInfo.szDescription + i,strReplayShow.ProgramInfo.episodeLen);
+            i = i + strReplayShow.ProgramInfo.episodeLen;
+            
+            // Convert Codepages
+            
+            ConvertCodepage(strReplayShow.ProgramInfo.szDescription);
+            ConvertCodepage(szShowTitle);
+            ConvertCodepage(szEpisodeTitle);
+                
+            // Build Strings
+
+            DisplayQuality(strReplayShow.quality,szQuality);
+
+            // Display Record
+            
+			strcat(szOutputBuffer, "<ITEM>\n");
+			strcat(szOutputBuffer,"\t<DISPLAYNAME>");
+
+            if (szEpisodeTitle[0] > 31) 
+            {
+                sprintf(szBuffer,"%s \"%s\"",szShowTitle,szEpisodeTitle);
+				strcat(szOutputBuffer, szBuffer);
+            }
+            else
+            {
+                if (ismovie) 
+                {
+
+                    if (szStarRating[0] != 0)
+                    {
+                        if (strMovieInfo.stars % 10)
+                        {
+                            sprintf(szBuffer,"%s (%s1/2, %s, %d",szShowTitle,szStarRating,szMPAARating,strMovieInfo.year);
+							strcat(szOutputBuffer, szBuffer);
+                        }
+                        else
+                        {
+                            sprintf(szBuffer,"%s (%s, %s, %d",szShowTitle,szStarRating,szMPAARating,strMovieInfo.year);
+							strcat(szOutputBuffer, szBuffer);
+                        }
+                    }
+                    else
+                    {
+                        sprintf(szBuffer,"%s (%s, %d",szShowTitle,szMPAARating,strMovieInfo.year);
+						strcat(szOutputBuffer, szBuffer);
+                    }
+                }
+                else
+                {
+					strcat(szOutputBuffer, szShowTitle);
+                }
+			}
+
+            // display flags
+
+            cc = 0;
+            i = 0;
+
+            if (iscc) 
+            {
+                cc++;
+            }
+            if (isstereo)
+            {
+                cc++;
+            }
+            if (isrepeat)
+            {
+                cc++;
+            }
+            if (issap)
+            {
+                cc++;
+            }
+            if (isppv)
+            {
+                cc++;
+            }
+
+            if (szTVRating[0] > 31)
+            {
+                cc++;
+            }
+
+            if (isletterbox)
+            {
+                cc++;
+            }
+
+            if (cc > 0)
+            {
+                if (ismovie)
+                {
+                    strcat(szOutputBuffer,", ");
+                }
+                else
+                {   
+                    strcat(szOutputBuffer," (");
+                }
+                i = 1;
+            }
+            else
+            {
+                if (ismovie)
+                {
+                    strcat(szOutputBuffer,")");
+                }
+            }
+
+            if (szTVRating[0] > 31)
+            {
+                strcat(szOutputBuffer,szTVRating);
+                cc--;
+                if (cc)
+                {
+                    strcat(szOutputBuffer,", ");
+                }
+            }
+
+            if (iscc)
+            {
+                strcat(szOutputBuffer,"CC");
+                cc--;
+                if (cc)
+                {
+                    strcat(szOutputBuffer,", ");
+                }
+            }
+
+            if (isstereo)
+            {
+                strcat(szOutputBuffer,"Stereo");
+                cc--;
+                if (cc)
+                {
+                    strcat(szOutputBuffer,", ");
+                }
+            }
+
+            if (isrepeat)
+            {
+                strcat(szOutputBuffer,"Repeat");
+                cc--;
+                if (cc)
+                {
+                    strcat(szOutputBuffer,", ");
+                }
+            }
+
+            if (issap)
+            {
+                strcat(szOutputBuffer,"SAP");
+                cc--;
+                if (cc)
+                {
+                    strcat(szOutputBuffer,", ");
+                }
+            }
+
+            if (isppv)
+            {
+                strcat(szOutputBuffer,"PPV");
+                cc--;
+                if (cc)
+                {
+                    strcat(szOutputBuffer,", ");
+                }
+            }
+
+            if (isletterbox)
+            {
+                strcat(szOutputBuffer,"Letterboxed");
+                cc--;
+                if (cc)
+                {
+                    strcat(szOutputBuffer,", ");
+                }
+            }
+
+            if (i > 0)
+            {
+                strcat(szOutputBuffer,")");
+            }
+            
+            if (hasparts)
+            {
+                sprintf(szBuffer,"Part %d of %d",strPartsInfo.partnumber,strPartsInfo.maxparts);
+				strcat(szOutputBuffer, szBuffer);
+            }
+
+			strcat(szOutputBuffer,"</DISPLAYNAME>\n");
+
+			sprintf(szBuffer,"\t<QUALITY>%s</QUALITY>\n",szQuality);
+			strcat(szOutputBuffer, szBuffer);
+
+			sprintf(szBuffer,"\t<RECORDED>%s</RECORDED>\n",UnixTimeToString(strReplayShow.recorded));
+			strcat(szOutputBuffer, szBuffer);
+            
+			sprintf(szBuffer,"\t<PATH>Video/%u.mpg</PATH>\n",strReplayShow.recorded);
+			strcat(szOutputBuffer, szBuffer);
+
+			strcat(szOutputBuffer,"\t<DURATION>");
+            i = strReplayShow.ProgramInfo.minutes + strReplayShow.afterpadding + strReplayShow.beforepadding;	
+            cc = CalculateMinutes(strReplayShow.seconds);       
+            if (cc != i)
+            {
+                // This can happen if the cable goes out during recording or if you hit STOP etc.
+                sprintf(szBuffer,"%d minutes ( %d scheduled )",cc,i);			
+            }
+            else
+            {
+                sprintf(szBuffer,"%d minutes",cc);			
+            }
+			strcat(szOutputBuffer, szBuffer);
+			strcat(szOutputBuffer,"</DURATION>\n");
+
+			sprintf(szBuffer,"\t<SIZE>%d</SIZE>\n",cc);
+			strcat(szOutputBuffer, szBuffer);
+
+			strcat(szOutputBuffer,"</ITEM>\n");
+
+			fptr += readsize;
+        }
+	}
+    while ( moreshows == true );
+	strcat(szOutputBuffer, "</REPLAYGUIDE>\n");
+    
+    // Done, shut it down
+    
+    //printf("Done!  %u ReplayShows parsed!\n", curshow);
+            
+    return 0;
+    
+}
+}
+

Copied: branches/linuxport/XBMC/xbmc/lib/libRTV/Makefile (from rev 14132, branches/linuxport/sources/librtv/Makefile)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libRTV/Makefile	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libRTV/Makefile	2008-07-15 21:54:34 UTC (rev 14135)
@@ -0,0 +1,12 @@
+OBJS=crypt.o guideclient.o GuideParser.o httpclient.o httpfsclient.o interface.o md5.o netclient.o rtv.o sleep.o
+
+%.o : %.c
+	gcc -c $< -D_LINUX -D__unix__
+%.o : %.cpp
+	g++ -c $< -D_LINUX
+
+librtv-i486-linux.a : $(OBJS)
+	ar rs $@  $(OBJS)
+
+clean:
+	$(RM) $(OBJS) librtv-i486-linux.a

Copied: branches/linuxport/XBMC/xbmc/lib/libRTV/Makefile.tiger (from rev 14132, branches/linuxport/sources/librtv/Makefile.tiger)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libRTV/Makefile.tiger	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libRTV/Makefile.tiger	2008-07-15 21:54:34 UTC (rev 14135)
@@ -0,0 +1,12 @@
+OBJS=crypt.o guideclient.o GuideParser.o httpclient.o httpfsclient.o interface.o md5.o netclient.o rtv.o sleep.o
+
+%.o : %.c
+	gcc -c $< -D_LINUX -D__unix__ -mmacosx-version-min=10.4 -I/Developer/SDKs/MacOSX10.4u.sdk/usr/include/
+%.o : %.cpp
+	g++ -c $< -D_LINUX -D__unix__ -mmacosx-version-min=10.4 -I/Developer/SDKs/MacOSX10.4u.sdk/usr/include/
+
+librtv-i486-linux.a : $(OBJS)
+	ar rs $@  $(OBJS)
+
+clean:
+	$(RM) $(OBJS) librtv-i486-linux.a

Copied: branches/linuxport/XBMC/xbmc/lib/libRTV/crypt.c (from rev 14132, branches/linuxport/sources/librtv/crypt.c)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libRTV/crypt.c	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libRTV/crypt.c	2008-07-15 21:54:34 UTC (rev 14135)
@@ -0,0 +1,213 @@
+#pragma code_seg( "RTV_TEXT" )
+#pragma data_seg( "RTV_DATA" )
+#pragma bss_seg( "RTV_BSS" )
+#pragma const_seg( "RTV_RD" )
+
+/*
+ * Copyright (C) 2002 John Todd Larason <jtl@...>
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ */
+
+#include "crypt.h"
+#include "md5.h"
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <time.h>
+
+static void checksum(unsigned char * dest, unsigned const char * src, u32 len,
+                     int checksum_num)
+{
+    
+    static unsigned char extradata[][64] = {{
+        0x41,0x47,0xc8,0x09, 0xba,0x3c,0x99,0x6a,
+        0xda,0x09,0x9a,0x0f, 0xc0,0xd3,0x47,0xca,
+        0xd1,0x95,0x81,0x19, 0xab,0x17,0xc6,0x5f,
+        0xad,0xea,0xe5,0x75, 0x9c,0x49,0x18,0xa5,
+        0xdf,0x35,0x46,0x5b, 0x78,0x0e,0xcb,0xc7,
+        0x8c,0x3e,0xf4,0x90, 0xa2,0xb7,0x8e,0x00,
+        0x53,0x8d,0x4c,0xab, 0x13,0xa5,0x16,0x00,
+        0xff,0xb8,0x4b,0x20, 0x29,0x22,0x9d,0xee,
+    }, {
+        0xda,0x76,0x5c,0xd4, 0x34,0xc3,0xd7,0x2c,
+        0xac,0x40,0xb8,0xd8, 0x59,0xbc,0x59,0x34, 
+        0xaa,0xbf,0x89,0xbd, 0x85,0xe8,0x40,0x27,
+        0x78,0x2b,0x18,0x6e, 0xa6,0x6e,0x5a,0xc6, 
+        0xda,0xe3,0x86,0x84, 0x40,0x14,0x2a,0x23,
+        0x4f,0x5d,0x38,0x5e, 0x7f,0xd9,0x73,0x7d, 
+        0xe4,0x80,0x3d,0x21, 0x28,0x41,0xf1,0xb2,
+        0x96,0x43,0x2b,0xcc, 0x0c,0x9d,0x26,0xb9,
+    }};
+
+	md5_context c;
+	md5_starts(&c);
+    md5_update(&c, src, len);
+    md5_update(&c, extradata[checksum_num], sizeof extradata[checksum_num]);
+    md5_finish(&c, dest);
+}
+
+static u32 cryptblock(u32 k, char * buf, u32 size)
+{
+    u32 i;
+
+    for (i = 0; i < size; i++) {
+        k = k * 0xb8f7 + 0x15bb9;
+        buf[i] ^= k;
+    }
+    return k;
+}
+
+/* cyphertext bytes:
+ *
+ * 2, 4, 1, 7 -- key material block 1
+ * 0, 3, 5, 6 -- unknown/unused
+ * 8..23      -- checksum(24..end)
+ * 24..27     -- crypt(0x42ffdfa9)
+ * 28..31     -- crypt(time_t)
+ * 32..end    -- crypt(text)
+ *
+ * it looks like you should be able to decrypt 24..end in one step, after
+ * getting the key material, if you don't want to do the sanity check first
+ * and don't mind it all in one buffer
+ */
+ 
+int rtv_decrypt(const char * cyphertext, u32 cyphertext_len,
+                char * plainbuf, u32 plainbuf_len,
+                u32 * p_time, u32 * p_plain_len,
+                int checksum_num)
+{
+    unsigned char key_buf[4];
+    unsigned char sanity_buf[4];
+    unsigned char time_buf[4];
+    unsigned char csum_buf[16];
+    unsigned char * p;
+    u32 key;
+    u32 sanity;
+#if VERBOSE_OBFUSC
+    unsigned char obfusc_buf[4];
+    u32 obfusc;
+#endif
+
+    if (plainbuf_len < cyphertext_len - 32)
+        return -1;
+
+    /* unshuffle the key and unxor it */
+    key_buf[0] = cyphertext[2];
+    key_buf[1] = cyphertext[4];
+    key_buf[2] = cyphertext[1];
+    key_buf[3] = cyphertext[7];
+    p = key_buf;
+    key = rtv_to_u32(&p) ^ 0xcb0baf47;
+
+#if VERBOSE_OBFUSC
+    obfusc_buf[0] = cyphertext[0];
+    obfusc_buf[1] = cyphertext[3];
+    obfusc_buf[2] = cyphertext[5];
+    obfusc_buf[3] = cyphertext[6];
+    p = key_buf;
+    obfusc = rtv_to_u32(&p);
+    //fprintf(stderr, "Key: %ld (0x%lx)\n", (unsigned long)key, (unsigned long)key);
+    //fprintf(stderr, "Obfusc: %ld (0x%lx)\n", (unsigned long)obfusc, (unsigned long)obfusc);
+#endif
+
+    /* check the sanity field */
+    memcpy(sanity_buf, cyphertext + 24, 4);
+    key = cryptblock(key, sanity_buf, 4);
+    p = sanity_buf;
+    sanity = rtv_to_u32(&p);
+    if (sanity != 0x42ffdfa9)
+        return -1;
+
+    /* decrypt the time field */
+    memcpy(time_buf, cyphertext + 28, 4);
+    key = cryptblock(key, time_buf, 4);
+
+    /* decrypt the actual text */
+    memcpy(plainbuf, cyphertext + 32, cyphertext_len - 32);
+    cryptblock(key, plainbuf, cyphertext_len - 32);
+
+    /* check the checksum */
+    checksum(csum_buf, cyphertext + 24, cyphertext_len - 24, checksum_num);
+    if (memcmp(csum_buf, cyphertext + 8, 16) != 0)
+        return -2;
+
+    if (p_plain_len) {
+        *p_plain_len = cyphertext_len - 32;
+    }
+    if (p_time) {
+        p = time_buf;
+        *p_time = rtv_to_u32(&p);
+#if VERBOSE_OBFUSC
+//	fprintf(stderr, "Time: %ld (0x%lx)\n", (unsigned long)*p_time, (unsigned long)*p_time);
+#endif
+    }
+    return 0;
+}
+
+int rtv_encrypt(const char * plaintext, u32 plaintext_len,
+                char * cyphertext, u32 buffer_len, u32 * cyphertext_len,
+                int checksum_num)
+{
+    u32 key;
+    u32 t;
+    u32 obfusc;
+    unsigned char key_buf[4];
+    unsigned char obfusc_buf[4];
+    unsigned char * p;
+    
+    if (buffer_len < plaintext_len + 32)
+        return -1;
+
+    /* make up a key and obfuscatory material; get the time */
+    key    = rand();
+    obfusc = rand();
+    t      = time(NULL);
+
+    p = NULL;//getenv("TIMEOFF");
+    if (p)
+        t += atoi(p);
+
+    /* encrypt the key */
+    p = key_buf;
+    rtv_from_u32(&p, key ^ 0xcb0baf47);
+
+    p = obfusc_buf;
+    rtv_from_u32(&p, obfusc);
+
+    /* scramble the key and obfusc material */
+    cyphertext[0]  = obfusc_buf[3];
+    cyphertext[1]  = key_buf[2];
+    cyphertext[2]  = key_buf[0];
+    cyphertext[3]  = obfusc_buf[2];
+    cyphertext[4]  = key_buf[1];
+    cyphertext[5]  = obfusc_buf[1];
+    cyphertext[6]  = obfusc_buf[0];
+    cyphertext[7]  = key_buf[3];
+
+    /* store the sanity check & time */
+    p = cyphertext + 24;
+    rtv_from_u32(&p, 0x42ffdfa9);
+    rtv_from_u32(&p, t);
+
+    /* copy the plaintext */
+    memcpy(p, plaintext, plaintext_len);
+
+    /* encrypt the whole thing */
+    cryptblock(key, cyphertext+24, plaintext_len+8);
+
+    /* fill in the checksum */
+    checksum(cyphertext + 8, cyphertext + 24, plaintext_len + 8, checksum_num);
+
+    /* and we're done */
+    *cyphertext_len = plaintext_len + 32;
+    return 0;
+}

Copied: branches/linuxport/XBMC/xbmc/lib/libRTV/guideclient.c (from rev 14132, branches/linuxport/sources/librtv/guideclient.c)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libRTV/guideclient.c	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libRTV/guideclient.c	2008-07-15 21:54:34 UTC (rev 14135)
@@ -0,0 +1,126 @@
+#pragma code_seg( "RTV_TEXT" )
+#pragma data_seg( "RTV_DATA" )
+#pragma bss_seg( "RTV_BSS" )
+#pragma const_seg( "RTV_RD" )
+
+/*
+ * Copyright (C) 2002 John Todd Larason <jtl@...>
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ */
+
+#include "rtv.h"
+#include "guideclient.h"
+#include "httpclient.h"
+
+#include <string.h>
+#include <stdio.h>
+
+#define MIN(x,y) ((x)<(y)?(x):(y))
+
+struct snapshot_data 
+{
+    int firsttime;
+    int filesize;
+    int bytes_read;
+    char * timestamp;
+    char * buf;
+    u32 status;
+};
+
+static void get_snapshot_callback(unsigned char * buf, size_t len, void * vd)
+{
+    struct snapshot_data * data = vd;
+    unsigned char * buf_data_start;
+    unsigned long bytes_to_read;
+    
+    if (data->firsttime) {
+        unsigned char * end, * equal, * cur;
+
+        data->firsttime = 0;
+
+        /* First line: error code */
+        cur = buf;
+        end = strchr(cur, '\n');
+        if (end) *end = '\0';
+        data->status = strtoul(cur, NULL, 16);
+        if (!end) return;
+        do {
+            cur = end + 1;
+            if (*cur == '#') {
+                end = strchr(cur, '\0');
+                len -= (end - buf);
+                buf_data_start = end;
+                break;
+            }
+            end = strchr(cur, '\n');
+            if (!end) return;
+            *end = '\0';
+            equal = strchr(cur, '=');
+            if (!equal) return;
+            if (strncmp(cur, "guide_file_name=", equal-cur+1) == 0) {
+                data->timestamp = malloc(strlen(equal+1)+1);
+                strcpy(data->timestamp, equal+1);
+            } else if (strncmp(cur, "FileLength=", equal-cur+1) == 0) {
+                data->filesize = strtoul(equal+1, NULL, 0);
+                data->buf = malloc(data->filesize);
+            } /* also "RemoteFileName", but we don't expose it */
+        } while (1);
+    } else {
+        buf_data_start = buf;
+    }
+
+    bytes_to_read = MIN(len, (unsigned)(data->filesize - data->bytes_read));
+    memcpy(data->buf + data->bytes_read, buf_data_start, bytes_to_read);
+    data->bytes_read += bytes_to_read;
+
+    free(buf);
+}
+
+unsigned long guide_client_get_snapshot(unsigned char ** presult,
+                                        unsigned char ** ptimestamp,
+                                        unsigned long * psize,
+                                        const char * address,
+                                        const char * cur_timestamp)
+{
+    struct snapshot_data data;
+    char url[512];
+    struct hc * hc;
+    
+    memset(&data, 0, sizeof data);
+    data.firsttime = 1;
+    data.status    = -1;
+
+    sprintf(url, "http://%s/http_replay_guide-get_snapshot?"
+            "guide_file_name=%s&serial_no=RTV4080K0000000000",
+            address,
+            cur_timestamp);
+
+    hc = hc_start_request(url);
+    if (!hc) {
+        perror("Error: guide_client_get_snapshot(): hc_start_request()");
+        goto exit;
+    }
+
+
+    hc_send_request(hc);
+    hc_read_pieces(hc, get_snapshot_callback, &data);
+
+    hc_free(hc);
+
+    *ptimestamp = data.timestamp;
+    *presult    = data.buf;
+    *psize      = data.filesize;
+
+exit:
+    return data.status;
+}
+

Copied: branches/linuxport/XBMC/xbmc/lib/libRTV/httpclient.c (from rev 14132, branches/linuxport/sources/librtv/httpclient.c)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libRTV/httpclient.c	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libRTV/httpclient.c	2008-07-15 21:54:34 UTC (rev 14135)
@@ -0,0 +1,492 @@
+#pragma code_seg( "RTV_TEXT" )
+#pragma data_seg( "RTV_DATA" )
+#pragma bss_seg( "RTV_BSS" )
+#pragma const_seg( "RTV_RD" )
+
+/*
+ * Copyright (C) 2002 John Todd Larason <jtl@...>
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ */
+
+#include "httpclient.h"
+
+#include <ctype.h>
+#include <stdio.h>
+#include <string.h>
+
+#define MAX_CHUNK 32768
+
+struct hc_headers 
+{
+    char * tag;
+    char * value;
+    struct hc_headers * next;
+};
+
+struct hc 
+{
+    struct nc * nc;
+    char * hostname;
+    short port;
+    char * localpart;
+    char * status;
+    struct hc_headers * req_headers;
+    struct hc_headers * rsp_headers;
+	size_t curr_chunk_len;
+};
+
+static void hc_h_free(struct hc_headers * hh)
+{
+    free(hh->tag);
+    free(hh->value);
+    free(hh);
+}
+
+static struct hc_headers * hc_h_make(const char * tag, const char * value)
+{
+    struct hc_headers * h;
+    
+    h = malloc(sizeof *h);
+    if (!h)
+        goto error;
+    memset(h, 0, sizeof *h);
+    
+    h->tag = strdup(tag);
+    if (!h->tag)
+        goto error;
+    
+    h->value = strdup(value);
+    if (!h->value)
+        goto error;
+    
+    return h;
+error:
+    if (h)
+        hc_h_free(h);
+    return NULL;
+}
+
+void hc_free(struct hc * hc)
+{
+    struct hc_headers * n;
+
+    if (hc) {
+        free(hc->hostname);
+        free(hc->localpart);
+        free(hc->status);
+        while (hc->req_headers) {
+            n = hc->req_headers->next;
+            hc_h_free(hc->req_headers);
+            hc->req_headers = n;
+        }
+        while (hc->rsp_headers) {
+            n = hc->rsp_headers->next;
+            hc_h_free(hc->rsp_headers);
+            hc->rsp_headers = n;
+        }
+        if (hc->nc)
+            nc_close(hc->nc);
+        free(hc);
+    }
+}
+
+int hc_add_req_header(struct hc * hc, const char * tag, const char * value)
+{
+    struct hc_headers * h;
+
+    h = hc_h_make(tag, value);
+    if (!h)
+        goto error;
+    h->next = hc->req_headers;
+    hc->req_headers = h;
+    return 0;
+error:
+    return -1;
+}
+
+struct hc * hc_start_request(char * url)
+{
+    struct hc * hc;
+    char * e;
+
+    hc = malloc(sizeof *hc);
+    memset(hc, 0, sizeof *hc);
+    
+    if (strncmp(url, "http://", 7) != 0) {
+        goto error;
+    }
+    url += 7;
+    e = strchr(url, '/');
+    if (!e) {
+        hc->hostname = strdup(url);
+        hc->localpart = strdup("/");
+    } else {
+        hc->hostname        = malloc(e - url + 1);
+        if (!hc->hostname) goto error;
+        memcpy(hc->hostname, url, e - url);
+        hc->hostname[e-url] = '\0';
+        hc->localpart       = strdup(e);
+        if (!hc->localpart) goto error;
+    }
+
+    if (hc_add_req_header(hc, "Host", hc->hostname) < 0)
+        goto error;
+
+    e = strchr(hc->hostname, ':');
+    if (e) {
+        *e = '\0';
+        hc->port = (short)strtoul(e+1, NULL, 10);
+    } else {
+        hc->port = 80;
+    }
+
+    hc->nc = nc_open(hc->hostname, hc->port);
+    if (!hc->nc)
+        goto error;
+    
+    return hc;
+error:
+    if (hc)
+        hc_free(hc);
+    return NULL;
+}
+
+int hc_send_request(struct hc * hc)
+{
+    char buffer[1024];
+    size_t l;
+    struct hc_headers * h;
+
+    l = strlen(hc->localpart) + strlen("GET  HTTP/1.1\r\n");
+    for (h = hc->req_headers; h; h = h->next)
+        l += strlen(h->tag) + strlen(h->value) + 4;
+    l += 3;
+    if (l > sizeof buffer) {
+        //fprintf(stderr, "ERROR: hc_send_request: buffer too small; need %lu\n",(unsigned long)l);
+        return -1;
+    }
+
+    l = sprintf(buffer, "GET %s HTTP/1.1\r\n", hc->localpart);
+    for (h = hc->req_headers; h; h = h->next)
+        l += sprintf(buffer+l, "%s: %s\r\n", h->tag, h->value);
+    l += sprintf(buffer+l, "\r\n");
+    nc_write(hc->nc, buffer, l);
+
+    if (nc_read_line(hc->nc, buffer, sizeof buffer) <= 0) {
+        perror("ERROR: hc_send_request nc_read_line");
+        return -1;
+    }
+    
+    hc->status = strdup(buffer);
+    while (nc_read_line(hc->nc, buffer, sizeof buffer) > 0) {
+        char * e;
+        e = strchr(buffer, ':');
+        if (e) {
+            *e = '\0';
+            e++;
+            while (isspace(*e))
+                e++;
+            h = hc_h_make(buffer, e);
+            h->next = hc->rsp_headers;
+            hc->rsp_headers = h;
+        } else {
+            //fprintf(stderr, "ERROR: hc_send_request got invalid header line :%s:\n", buffer);
+        }
+    }
+    
+    return 0;
+}
+
+int hc_post_request(struct hc * hc,
+                    int (*callback)(unsigned char *, size_t, void *),
+                    void * v)
+{
+    char buffer[1024];
+    size_t l;
+    struct hc_headers * h;
+
+    l = strlen(hc->localpart) + strlen("POST  HTTP/1.0\r\n");
+    for (h = hc->req_headers; h; h = h->next)
+        l += strlen(h->tag) + strlen(h->value) + 4;
+    l += 3;
+    if (l > sizeof buffer) {
+        //fprintf(stderr, "ERROR: hc_post_request: buffer too small; need %lu\n",(unsigned long)l);
+        return -1;
+    }
+
+    l = sprintf(buffer, "POST %s HTTP/1.0\r\n", hc->localpart);
+    for (h = hc->req_headers; h; h = h->next)
+        l += sprintf(buffer+l, "%s: %s\r\n", h->tag, h->value);
+    l += sprintf(buffer+l, "\r\n");
+    nc_write(hc->nc, buffer, l);
+
+    while ((l = callback(buffer, sizeof buffer, v)) != 0) {
+        int r;
+        r = nc_write(hc->nc, buffer, l);
+//      fprintf(stderr, "%d\n", r);
+        
+    }
+  
+    if (nc_read_line(hc->nc, buffer, sizeof buffer) <= 0) {
+        perror("ERROR: hc_post_request nc_read_line");
+        return -1;
+    }
+    hc->status = strdup(buffer);
+    while (nc_read_line(hc->nc, buffer, sizeof buffer) > 0) {
+        char * e;
+        e = strchr(buffer, ':');
+        if (e) {
+            *e = '\0';
+            e++;
+            while (isspace(*e))
+                e++;
+            h = hc_h_make(buffer, e);
+            h->next = hc->rsp_headers;
+            hc->rsp_headers = h;
+        } else {
+            //fprintf(stderr, "ERROR: hc_post_request got invalid header line :%s:\n", buffer);
+        }
+    }
+    
+    return 0;
+}
+
+int hc_get_status(struct hc * hc)
+{
+    return strtoul(hc->status + 9, NULL, 10);
+}
+
+char * hc_lookup_rsp_header(struct hc * hc, const char * tag)
+{
+    struct hc_headers * h;
+    
+    for (h = hc->rsp_headers; h; h = h->next)
+        if (strcasecmp(tag, h->tag) == 0)
+            return h->value;
+    return NULL;
+}
+
+extern int hc_read_pieces(struct hc * hc,
+                          void (*callback)(unsigned char *, size_t, void *),
+                          void * v)
+{
+    char * te;
+    int chunked = 0;
+    int done = 0;
+    char * buf;
+    size_t len, len_read, octets_to_go;
+    char * cl;
+    
+    cl = hc_lookup_rsp_header(hc, "Content-Length");
+    if (cl) {
+        octets_to_go = strtoul(cl, NULL, 10);
+    } else {
+        octets_to_go = 0;
+    }
+    
+    te = hc_lookup_rsp_header(hc, "Transfer-Encoding");
+    if (te && strcmp(te, "chunked") == 0) {
+        chunked = 1;
+    }
+    while (!done) {
+        if (chunked) {
+            char lenstr[32];
+
+            nc_read_line(hc->nc, lenstr, sizeof lenstr);
+            len = strtoul(lenstr, NULL, 16);
+        } else {
+            if (cl) {
+                len = octets_to_go;
+                if (len > MAX_CHUNK)
+                    len = MAX_CHUNK;
+            } else {
+                len = MAX_CHUNK;
+            }
+        }
+        if (len) {
+            buf = malloc(len+1);
+            len_read = nc_read(hc->nc, buf, len);
+            if (len_read < len)
+                done = 1;
+            buf[len_read] = '\0';
+            callback(buf, len_read, v);
+            if (cl) {
+                octets_to_go -= len_read;
+                if (octets_to_go == 0 && !chunked) {
+                    done = 1;
+                }
+            }
+        } else {
+            done = 1;
+        }
+        if (chunked) {
+            char linebuf[80];
+            /* if done, then any non-blank lines read here are
+               supposed to be treated as HTTP header lines, but since
+               we didn't say we could accept trailers, the server's
+               only allowed to send them if it's happy with us
+               discarding them. (2616 3.7b).  The Replay doesn't use
+               trailers anyway */
+            while (nc_read_line(hc->nc, linebuf, sizeof linebuf) > 0)
+                ;
+        }
+    }
+    return 0;
+}
+
+struct chunk
+{
+    char * buf;
+    size_t len;
+    struct chunk * next;
+};
+
+struct read_all_data 
+{
+    struct chunk * start;
+    struct chunk * end;
+    size_t total;
+};
+
+static void read_all_callback(unsigned char * buf, size_t len, void * vd)
+{
+    struct read_all_data * data = vd;
+    struct chunk * chunk;
+
+    chunk = malloc(sizeof *chunk);
+    chunk->buf = buf;
+    chunk->len = len;
+    chunk->next = NULL;
+    
+    if (data->end) {
+        data->end->next = chunk;
+        data->end = chunk;
+    } else {
+        data->start = data->end = chunk;
+    }
+
+    data->total += len;
+}
+
+unsigned char * hc_read_all_len(struct hc * hc, size_t * plen)
+{
+    struct read_all_data data;
+    struct chunk * chunk, * next;
+    size_t cur;
+    unsigned char * r;
+    
+    data.start = data.end = NULL;
+    data.total = 0;
+    
+    hc_read_pieces(hc, read_all_callback, &data);
+    
+    r = malloc(data.total + 1);
+    cur = 0;
+    for (chunk = data.start; chunk; chunk = next) {
+        memcpy(r+cur, chunk->buf, chunk->len);
+        cur += chunk->len;
+        free(chunk->buf);
+        next = chunk->next;
+        free(chunk);
+    }
+
+    r[data.total] = '\0';
+    if (plen)
+        *plen = data.total;
+    
+    return r;
+}
+
+unsigned char * hc_read_all(struct hc * hc)
+{
+    return hc_read_all_len(hc, NULL);
+}
+
+
+extern int hc_read_pieces_len(struct hc * hc,
+                          void (*callback)(unsigned char *, size_t, void *),
+                          void * v, size_t len_to_read)
+{
+    char * te;
+    int chunked = 0;
+    int done = 0;
+    char * buf;
+    size_t len, len_read, octets_to_go;
+    char * cl;
+    
+	// NOTE: len_to_read is not currently implemented for non-chunked content.
+	// The ReplayTV only sends chunked content so this doesn't matter here.
+    cl = hc_lookup_rsp_header(hc, "Content-Length");
+    if (cl) {
+        octets_to_go = strtoul(cl, NULL, 10);
+    } else {
+        octets_to_go = 0;
+    }
+    
+    te = hc_lookup_rsp_header(hc, "Transfer-Encoding");
+    if (te && strcmp(te, "chunked") == 0) {
+        chunked = 1;
+    }
+    while (!done) {
+        if (chunked) {
+            char lenstr[32];
+			
+			if (!hc->curr_chunk_len) {
+				nc_read_line(hc->nc, lenstr, sizeof lenstr);
+				hc->curr_chunk_len = strtoul(lenstr, NULL, 16);
+			}
+			if (len_to_read > hc->curr_chunk_len) {
+				len = hc->curr_chunk_len;
+			} else {
+				len = len_to_read;
+			}
+        } else {
+            if (cl) {
+                len = octets_to_go;
+                if (len > MAX_CHUNK)
+                    len = MAX_CHUNK;
+            } else {
+                len = MAX_CHUNK;
+            }
+        }
+        if (len) {
+            buf = malloc(len+1);
+            len_read = nc_read(hc->nc, buf, len);
+            if (len_read <= len)
+                done = 1;
+            buf[len_read] = '\0';
+            callback(buf, len_read, v);
+            if (cl) {
+                octets_to_go -= len_read;
+                if (octets_to_go == 0 && !chunked) {
+                    done = 1;
+                }
+            }
+			hc->curr_chunk_len -= len_read;
+        } else {
+            done = 1;
+        }
+        if (chunked && !hc->curr_chunk_len) {
+            char linebuf[80];
+            /* if done, then any non-blank lines read here are
+               supposed to be treated as HTTP header lines, but since
+               we didn't say we could accept trailers, the server's
+               only allowed to send them if it's happy with us
+               discarding them. (2616 3.7b).  The Replay doesn't use
+               trailers anyway */
+            while (nc_read_line(hc->nc, linebuf, sizeof linebuf) > 0)
+                ;
+        }
+    }
+    return 0;
+}
+

Copied: branches/linuxport/XBMC/xbmc/lib/libRTV/httpfsclient.c (from rev 14132, branches/linuxport/sources/librtv/httpfsclient.c)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libRTV/httpfsclient.c	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libRTV/httpfsclient.c	2008-07-15 21:54:34 UTC (rev 14135)
@@ -0,0 +1,399 @@
+#pragma code_seg( "RTV_TEXT" )
+#pragma data_seg( "RTV_DATA" )
+#pragma bss_seg( "RTV_BSS" )
+#pragma const_seg( "RTV_RD" )
+
+/*
+ * Copyright (C) 2002 John Todd Larason <jtl@...>
+ *
+ * Parts based on ReplayPC 0.3 by Matthew T. Linehan and others
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ */
+
+#include "httpfsclient.h"
+#include "sleep.h"
+#include "crypt.h"
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+int hfs_output_errors = 1;
+
+#define ARGBUFSIZE 2048
+static int make_httpfs_url(char * dst, size_t size,
+                           const char * address, const char * command,
+                           va_list args) 
+{
+    char * d, * tag, * value, *argp;
+    int argno = 0;
+    size_t l, argl;
+    char argbuf[ARGBUFSIZE];          /* XXX bad, should fix this */
+
+    (void) size;
+
+    l = strlen(address) + strlen(command) + strlen("http:///httpfs-?");
+    if (l >= size) {
+        //if (hfs_output_errors)
+            //fprintf(stderr, "Error: make_httpfs_url: address + command too long for buffer\n");
+        return -1;
+    }
+    
+    d = dst;
+    d += sprintf(d, "http://%s/httpfs-%s?", address, command);
+
+    argp = argbuf;
+    argl = 0;
+    while ((tag = va_arg(args, char *)) != NULL) {
+        value = va_arg(args, char *);
+        if (value == NULL) {
+            continue;
+        }
+        if (argno)
+            argl++;
+        argl += strlen(tag)+1+strlen(value);
+        if (argl >= sizeof(argbuf)) {
+            //if (hfs_output_errors)
+                //fprintf(stderr, "Error: make_httpfs_url: with arg %s, argbuf too small\n", tag);
+            return -1;
+        }
+        if (argno)
+            *argp++ = '&';
+        argp += sprintf(argp, "%s=%s", tag, value);
+        argno++;
+    }
+    
+    if (replaytv_version.major >= 5 ||
+        (replaytv_version.major == 4 && replaytv_version.minor >= 3)) {
+        unsigned char ctext[ARGBUFSIZE+32] ;
+        u32 ctextlen;
+        unsigned int i;
+
+        if (l + strlen("__Q_=") + 2*argl + 32 >= size) {
+            //if (hfs_output_errors)
+              //  fprintf(stderr, "Error: make_httpfs_url: encrypted args too large for buffer\n");
+            return -1;
+        }
+
+        strcpy(d, "__Q_=");
+        d += strlen(d);
+        rtv_encrypt(argbuf, argl, ctext, sizeof ctext, &ctextlen, 1);
+        for (i = 0; i < ctextlen; i++)
+            d += sprintf(d, "%02x", ctext[i]);
+    } else {
+        if (l + argl >= size) {
+            //if (hfs_output_errors)
+                //fprintf(stderr, "Error: make_httpfs_url: args too large for buffer\n");
+            return -1;
+        }
+        strcpy(d, argbuf);
+    }
+    
+    return 0;
+}
+
+static int add_httpfs_headers(struct hc * hc)
+{
+    hc_add_req_header(hc, "Authorization",   "Basic Uk5TQmFzaWM6QTd4KjgtUXQ=" );
+    hc_add_req_header(hc, "User-Agent",      "Replay-HTTPFS/1");
+    hc_add_req_header(hc, "Accept-Encoding", "text/plain");
+
+    return 0;
+}
+
+static struct hc * make_request(const char * address, const char * command,
+                                va_list ap)
+{
+    struct hc * hc = NULL;
+    char url[URLSIZE];
+    int http_status;
+
+    if (make_httpfs_url(url, sizeof url, address, command, ap) < 0)
+        goto exit;
+
+    hc = hc_start_request(url);
+    if (!hc) {
+        if (hfs_output_errors)
+            perror("Error: make_request(): hc_start_request()"); 
+        if (errno == 0) {
+//            fprintf(stderr, "Check your clock.\n"
+  //                  "The system clock must be within 40 seconds of the Replay's.");
+        }
+        goto exit;
+    } 
+
+    if (add_httpfs_headers(hc)) {
+        goto exit;
+    }
+
+    hc_send_request(hc);
+
+    http_status = hc_get_status(hc);
+    if (http_status/100 != 2) {
+        //if (hfs_output_errors) 
+            //fprintf(stderr, "Error: http status %d\n", http_status);
+        goto exit;
+    }
+
+    return hc;
+    
+exit:
+    if (hc)
+        hc_free(hc);
+    return NULL;
+}
+
+    
+unsigned long hfs_do_simple(char ** presult, const char * address,
+                            const char * command, ...)
+{
+    va_list       ap;
+    struct hc *   hc;
+    char *        tmp, * e;
+    int           http_status;
+    unsigned long rtv_status;
+    
+    va_start(ap, command);
+    hc = make_request(address, command, ap);
+    va_end(ap);
+
+    if (!hc)
+        return -1;
+
+    http_status = hc_get_status(hc);
+    if (http_status/100 != 2) {
+        //if (hfs_output_errors)
+          //  fprintf(stderr, "Error: http status %d\n", http_status);
+        hc_free(hc);
+        return http_status;
+    }
+
+    tmp = hc_read_all(hc);
+    hc_free(hc);
+
+    e = strchr(tmp, '\n');
+    if (e) {
+        *presult = strdup(e+1);
+        rtv_status = strtoul(tmp, NULL, 10);
+        free(tmp);
+        return rtv_status;
+    } else if (http_status == 204) {
+        *presult = NULL;
+        free(tmp);
+        return 0;
+    } else {
+        //if (hfs_output_errors)
+          //  fprintf(stderr, "Error: end of httpfs status line not found\n");
+        return -1;
+    }
+}
+
+struct hfs_data
+{
+    void (*fn)(unsigned char *, size_t, void *);
+    void * v;
+    unsigned long status;
+    u16 msec_delay;
+    u8 firsttime;
+	char * buffer;
+	size_t bufLen;
+};
+
+/* XXX should this free the buf, or make a new one on the first block
+ * and let our caller free them if it wants? */
+static void hfs_callback(unsigned char * buf, size_t len, void * vd)
+{
+    struct hfs_data * data = vd;
+    unsigned char * buf_data_start;
+    
+    if (data->firsttime) {
+        unsigned char * e;
+
+        data->firsttime = 0;
+
+        /* First line: error code */
+        e = strchr(buf, '\n');
+        if (e)
+            *e = '\0';
+        data->status = strtoul(buf, NULL, 16);
+
+        e++;
+        len -= (e - buf);
+        buf_data_start = e;
+    } else {
+        buf_data_start = buf;
+    }
+
+    data->fn(buf_data_start, len, data->v);
+    free(buf);
+
+    if (data->msec_delay)
+        rtv_sleep(data->msec_delay);
+}
+
+unsigned long hfs_do_chunked(void (*fn)(unsigned char *, size_t, void *),
+                             void *v,
+                             const char * address,
+                             u16 msec_delay,
+                             const char * command,
+                             ...)
+{
+    struct hfs_data data;
+    struct hc *   hc;
+    va_list ap;
+    
+    va_start(ap, command);
+    hc = make_request(address, command, ap);
+    va_end(ap);
+
+    if (!hc)
+        return -1;
+
+    memset(&data, 0, sizeof data);
+    data.fn         = fn;
+    data.v          = v;
+    data.firsttime  = 1;
+    data.msec_delay = msec_delay;
+    
+    hc_read_pieces(hc, hfs_callback, &data);
+    hc_free(hc);
+
+    return data.status;
+}
+
+unsigned long hfs_do_post_simple(char ** presult, const char * address,
+                                 int (*fn)(unsigned char *, size_t, void *),
+                                 void *v,
+                                 unsigned long size,
+                                 const char * command, ...)
+{
+    char          buf[URLSIZE];
+    va_list       ap;
+    struct hc *   hc;
+    char *        tmp, * e;
+    int           http_status;
+    unsigned long rtv_status;
+    
+    va_start(ap, command);
+    if (make_httpfs_url(buf, sizeof buf, address, command, ap) < 0)
+        return -1;
+    va_end(ap);
+
+    errno = 0;
+    hc = hc_start_request(buf);
+    if (!hc) {
+        if (hfs_output_errors)
+            perror("Error: hfs_do_simple(): hc_start_request()");
+        if (errno == 0) {
+            //fprintf(stderr, "Check your clock.\n"
+            //        "The system clock must be within 40 seconds of the Replay's.");
+        }
+        return -1;
+    } 
+    sprintf(buf, "%lu", size);
+    if (add_httpfs_headers(hc) != 0)
+        return -1;
+    
+    hc_add_req_header(hc, "Content-Length",  buf);
+    
+    hc_post_request(hc, fn, v);
+
+    http_status = hc_get_status(hc);
+    if (http_status/100 != 2) {
+        //if (hfs_output_errors)
+          //  fprintf(stderr, "Error: http status %d\n", http_status);
+        hc_free(hc);
+        return http_status;
+    }
+    
+    tmp = hc_read_all(hc);
+    hc_free(hc);
+
+    e = strchr(tmp, '\n');
+    if (e) {
+        *presult = strdup(e+1);
+        rtv_status = strtoul(tmp, NULL, 10);
+        free(tmp);
+        return rtv_status;
+    } else if (http_status == 204) {
+        *presult = NULL;
+        free(tmp);
+        return 0;
+    } else {
+        //if (hfs_output_errors)
+            //fprintf(stderr, "Error: end of httpfs status line not found\n");
+        return -1;
+    }
+}
+
+
+static void hfs_callback2(unsigned char * buf, size_t len, void * vd)
+{
+    struct hfs_data * data = vd;
+    unsigned char * buf_data_start;
+    
+    if (data->firsttime) {
+        unsigned char * e;
+
+        data->firsttime = 0;
+
+        /* First line: error code */
+        e = strchr(buf, '\n');
+        if (e)
+            *e = '\0';
+        data->status = strtoul(buf, NULL, 16);
+
+        e++;
+        len -= (e - buf);
+        buf_data_start = e;
+    } else {
+        buf_data_start = buf;
+    }
+
+    /* append to buffer, this may be called multiple times */
+    memcpy(data->buffer+data->bufLen, buf_data_start, len);
+    data->bufLen += len;
+    free(buf);
+}
+
+struct hc * hfs_do_chunked_open(const char * address, const char * command, ...)
+{
+    struct hc *   hc;
+    va_list ap;
+    
+    va_start(ap, command);
+    hc = make_request(address, command, ap);
+    va_end(ap);
+	
+    return hc;
+}
+
+size_t hfs_do_chunked_read(struct hc * hc, char * buf, size_t pos, size_t len)
+{
+    struct hfs_data data;
+
+    memset(&data, 0, sizeof data);
+    data.buffer          = buf;
+	if (!pos)
+		data.firsttime  = 1;
+    
+    hc_read_pieces_len(hc, hfs_callback2, &data, len);
+
+    return data.bufLen;
+}
+
+void hfs_do_chunked_close(struct hc * hc)
+{
+    hc_free(hc);
+}
+

Copied: branches/linuxport/XBMC/xbmc/lib/libRTV/interface.c (from rev 14132, branches/linuxport/sources/librtv/interface.c)
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libRTV/interface.c	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libRTV/interface.c	2008-07-15 21:54:34 UTC (rev 14135)
@@ -0,0 +1,361 @@
+#pragma code_seg( "RTV_TEXT" )
+#pragma data_seg( "RTV_DATA" )
+#pragma bss_seg( "RTV_BSS" )
+#pragma const_seg( "RTV_RD" )
+
+/*
+ * libRTV
+ * by rtvguy
+ * A library encapsulating most of the functionality of John Todd Larason's
+ * ReplayPC project and Lee Thompson's GuideParser project.
+ * 
+ * libRTV includes much of the original source code by the authors of the
+ * ReplayPC and GuideParser projects.  GuideParser was modified under the
+ * terms of its license to remove support for parsing ReplayChannels and
+ * add support for parsing all current versions of ReplayGuide data.  ReplayPC
+ * was modified under the terms of its license to improve efficiency of the
+ * network code for the purposes of streaming video to a calling program, as
+ * well as to remove reliance on the OpenSSL library for MD5 functions.
+ *
+ * ReplayPC Copyright (C) 2002 John Todd Larason <jtl@...>
+ * GuideParser Copyright (C) 2002-2003 Lee Thompson <thompsonl@...>,
+ *    Dan Frumin <rtv@...>, Todd Larason <jtl@...>
+ * libRTV Copyright (C) 2003-2004 rtvguy
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ */
+
+#include <string.h>
+#include <stdio.h>
+
+#include "httpfsclient.h"
+#include "guideclient.h"
+#include "GuideParser.h"
+#include "interface.h"
+
+#ifdef _XBOX
+#include <Xtl.h>
+typedef SOCKET socket_fd;
+#elif defined _WIN32
+#include <winsock2.h>
+#pragma comment(lib, "ws2_32.lib")
+typedef SOCKET socket_fd;
+#else
+#include <unistd.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <sys/select.h>
+#include <stdlib.h>
+#define closesocket(fd) close(fd)
+typedef int socket_fd;
+typedef  socket_fd SOCKET;
+#define INVALID_SOCKET (-1)
+#endif
+
+//*********************************************************************************************
+u64 rtv_get_filesize(const char* strHostName, const char* strFileName)
+{
+    char * data = NULL;
+    char ** lines;
+    int num_lines;
+    int i;
+    u64 size;
+    unsigned long status;
+
+    status = hfs_do_simple(&data, strHostName,
+                           "fstat",
+                           "name", strFileName,
+                           NULL);
+    if (status != 0) {
+        //fprintf(stderr, "Error fstat %ld\n", status);
+        free(data);
+        return 0;
+    }
+
+    num_lines = rtv_split_lines(data, &lines);
+    for (i = 0; i < num_lines; i++) {
+        if (strncmp(lines[i], "size=", 5) == 0) {
+            sscanf(lines[i]+5, "%"U64F"d", &size);
+			break;
+        }
+    }
+
+    rtv_free_lines(num_lines, lines);
+    free(data);
+	return size;
+}
+//*********************************************************************************************
+unsigned long rtv_get_guide(unsigned char ** result, const char * address)
+{
+    char *          orig_timestamp = "0";
+    unsigned char * timestamp = NULL;
+    unsigned long   size;
+    unsigned long   status;
+
+	status = guide_client_get_snapshot(result, &timestamp, &size,
+									address, orig_timestamp);
+	if (timestamp)
+		free(timestamp);
+	if (status != 0) {
+		//fprintf(stderr, "Error get_snapshot %ld\n", status);
+		return 0;
+	}
+
+	return size;
+}
+//*********************************************************************************************
+int rtv_parse_guide(char * szOutputBuffer, const char * szInput, const size_t InputSize)
+{
+	return(GuideParser(szOutputBuffer, szInput, InputSize));
+}
+//*********************************************************************************************
+int rtv_get_guide_xml(unsigned char ** result, const char * address)
+{
+	unsigned long gsize;
+	unsigned char * lresult = NULL;
+
+	gsize = rtv_get_guide(&lresult, address);
+	if (!gsize)
+	{
+		if (lresult)
+			free (lresult);
+		return 0;
+	}
+
+	*result = malloc(gsize * 1.5);
+	if (!*result)
+	{
+		if (lresult)
+			free (lresult);
+		return 0;
+	}
+
+	rtv_parse_guide(*result, lresult, gsize);
+
+	if (lresult)
+		free (lresult);
+	return 1;
+}
+//*********************************************************************************************
+int rtv_list_files(unsigned char ** result, const char * address, const char * path)
+{
+    unsigned long status;
+
+    status = hfs_do_simple(result, address,
+                           "ls",
+                           "name", path,
+                           NULL);
+    if (status != 0) {
+        //fprintf(stderr, "Error %ld\n", status);
+		if (result)
+			free(result);
+        return 0;
+    }
+
+	return 1;
+}
+//*********************************************************************************************
+RTVD rtv_open_file(const char * address, const char * strFileName, u64 filePos)
+{
+	RTVD rtvd;
+	char szOffset[32];
+
+	rtvd = malloc(sizeof *rtvd);
+
+	rtvd->firstReadDone = 0;
+#ifdef _LINUX
+	sprintf(szOffset,"%ll",filePos);
+#else
+	_i64toa(filePos,szOffset,10);
+#endif
+
+	rtvd->hc = hfs_do_chunked_open(	address,
+								"readfile",
+								"pos",  szOffset,
+								"name", strFileName,
+								NULL);
+	return rtvd;
+}
+//*********************************************************************************************
+size_t rtv_read_file(RTVD rtvd, char * lpBuf, size_t uiBufSize)
+{
+	size_t lenread;
+
+	lenread = hfs_do_chunked_read(rtvd->hc, (char *) lpBuf, rtvd->firstReadDone, uiBufSize);
+	rtvd->firstReadDone = 1;
+
+	return lenread;
+}
+//*********************************************************************************************
+void rtv_close_file(RTVD rtvd)
+{
+	hfs_do_chunked_close(rtvd->hc);
+	free(rtvd);
+}
+//*********************************************************************************************
+int rtv_discovery(struct RTV ** result, unsigned long msTimeout)
+{
+	const char upnpQuery[] = "M-SEARCH * HTTP/1.1\r\nHOST: 239.255.255.250:1900\r\nMAN: \"ssdp:discover\"\r\nST: urn:replaytv-com:device:ReplayDevice:1\r\nMX: 3\r\n\r\n";
+	const char httpQuery[] = "GET /%s HTTP/1.1\r\nHost: %s\r\n\r\n";
+	char sendBuf[128];
+	char upnpFile[32];
+	char * p1, * p2;
+	char msg[2048];
+	char opt;
+	int r, len, numRTV;
+	SOCKET s1, s2;
+	struct timeval tv;
+	struct RTV * rtv = NULL;
+	fd_set fds1, fds2;
+	struct sockaddr_in sin;  /* send address structure */
+	struct sockaddr_in sin2; /* receive address structure */
+
+
+	// Need to initialize Winsock on Win32
+#if defined(_WIN32) && !defined(_XBOX)
+	WSADATA wd;
+	if (WSAStartup(MAKEWORD(2,2), &wd) == -1)
+	{
+		goto error;
+	}
+#endif
+
+	// Set up the information for the UPNP port connection
+	sin.sin_family = AF_INET;
+	sin.sin_port = htons(1900);
+
+	// For some reason, the UPNP address doesn't work on Xbox; so we
+	// use the broadcast address, which seems to work.
+#if defined(_XBOX) || defined(_WIN32)
+	sin.sin_addr.S_un.S_addr = htonl(INADDR_BROADCAST);
+#else
+	inet_aton("239.255.255.250",&sin.sin_addr.s_addr);
+#endif
+
+	if ((s1 = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
+	{
+		//fprintf(stderr,"error: socket(): %d\n", errno);
+		goto error;
+	}
+
+	opt = 1;
+	if ((setsockopt(s1, SOL_SOCKET, SO_BROADCAST, &opt, sizeof(opt))) == -1) {
+		goto error;
+	}
+
+	// Send the UPNP query
+	r = sendto(s1, upnpQuery, (int) strlen(upnpQuery), 0, (struct sockaddr *)&sin, sizeof(sin));
+	
+	// Initialize variables in preparation to receive responses from the ReplayTV(s)
+	numRTV = 0;
+	rtv = calloc(1, sizeof(struct RTV));
+	if (!rtv) goto error;
+	//memset(rtv,0,sizeof(struct RTV));
+	tv.tv_sec = msTimeout / 1000;
+	tv.tv_usec = (msTimeout % 1000) * 1000;
+	FD_ZERO(&fds1);
+	FD_SET(s1, &fds1);
+
+	// Read the response from a ReplayTV, loop while there are more responses waiting
+	while (select((int) s1 + 1, &fds1, NULL, NULL, &tv))
+	{
+		len = sizeof(struct sockaddr);
+		r = recvfrom(s1, msg, sizeof(msg), 0, (struct sockaddr *)&sin2, &len);
+		if (r < 0)
+		{
+			//fprintf(stderr, "recvfrom error: %d\n", errno);
+		} else {
+			numRTV++;
+

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.