Update of /cvsroot/player/mid/installer
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv28788

Modified Files:
      Tag: hxclient_3_4_8_atlas
	copyfiles.py 
Log Message:
HW & SW codecs inclusion together in MID build

Index: copyfiles.py
===================================================================
RCS file: /cvsroot/player/mid/installer/copyfiles.py,v
retrieving revision 1.19.2.7
retrieving revision 1.19.2.7.4.1
diff -u -d -r1.19.2.7 -r1.19.2.7.4.1
--- copyfiles.py	8 Jan 2009 11:31:08 -0000	1.19.2.7
+++ copyfiles.py	25 Mar 2009 04:31:58 -0000	1.19.2.7.4.1
@@ -277,34 +277,17 @@
 project.writeln("\tln -s ../mpgrender.so "   + inst.tempdir + "/opt/helix/mediaplatform/thumbnail/mpgrender.so")
 inst.AddToFileList("opt/helix/mediaplatform/thumbnail/mpgrender.so")
 
-# Are we using the HW-accelerated modules?
-if project.IsDefined("HELIX_FEATURE_MID_USE_HW_ACCEL"):
-    # We ARE using the hardware-accelerated binaries
-    #
-    # Copy HW-accelerated binaries to /opt/helix/mediaplatform directory
-    inst.CopyModuleDlls(
+# Copy hardware-accelerated binaries to /opt/helix/mediaplatform directory 
+inst.CopyModuleDlls(
 #        ("datatype_dist/ac3/renderer",       "libipp_hx_ac3ad",  "opt/helix/mediaplatform/libipp_hx_ac3ad"),
         ("datatype_dist/mp4/video/renderer", "libipp_hx_h264vd", "opt/helix/mediaplatform/libipp_hx_h264vd"),
         ("datatype_dist/mp4/video/renderer", "libipp_hx_mp4vd",  "opt/helix/mediaplatform/libipp_hx_mp4vd"),
 #        ("datatype_dist/mpg/fileformat",     "libipp_hx_mp2sp",  "opt/helix/mediaplatform/libipp_hx_mp2sp"),
 #        ("datatype_dist/mpg/renderer",       "libipp_hx_mp2vd",  "opt/helix/mediaplatform/libipp_hx_mp2vd"),
         ("datatype_dist/wm/video/renderer",  "libipp_hx_vc1vd",  "opt/helix/mediaplatform/libipp_hx_vc1vd"))
-    # Copy necessary plugins to /opt/helix/mediaplatform/thumbnail directory
-    inst.CopyModuleDlls(
-        ("datatype/h264/codec/decoder",             "avc1",        "opt/helix/mediaplatform/thumbnail/avc1"),
-        ("datatype/h264/codec/decoder",             "h264dec",     "opt/helix/mediaplatform/thumbnail/h264dec"),
-        ("datatype/rm/video/codec/g2mp4combo",      "dmp4",        "opt/helix/mediaplatform/thumbnail/dmp4"),
-        ("datatype/rm/video/codec/g2mp4combo",      "mp4v",        "opt/helix/mediaplatform/thumbnail/mp4v"),
-        ("datatype/mp4/video/renderer",             "mp4vrender",  "opt/helix/mediaplatform/thumbnail/mp4vrender"),
-        ("datatype/mpg/fileformat",                 "mpgfformat",  "opt/helix/mediaplatform/thumbnail/mpgfformat"),
-        ("datatype/wm/video/codec/wmv8",            "wmv8",        "opt/helix/mediaplatform/thumbnail/wmv8"),
-        ("datatype/wm/video/codec/wmv9",            "wmv9",        "opt/helix/mediaplatform/thumbnail/wmv9"),
-        ("datatype/wm/video/renderer",              "wmvrender",   "opt/helix/mediaplatform/thumbnail/wmvrender"))
-else:
-    # We are NOT using the hardware-accelerated binaries
-    #
+
     # Copy helix plugins to /opt/helix/mediaplatform directory
-    inst.CopyModuleDlls(
+inst.CopyModuleDlls(
         ("datatype/h264/codec/decoder",             "avc1",        "opt/helix/mediaplatform/avc1"),
         ("datatype/rm/video/codec/g2mp4combo",      "dmp4",        "opt/helix/mediaplatform/dmp4"),
         ("datatype/h264/codec/decoder",             "h264dec",     "opt/helix/mediaplatform/h264dec"),
@@ -315,24 +298,25 @@
         ("datatype/wm/video/codec/wmv9",            "wmv9",        "opt/helix/mediaplatform/wmv9"),
         ("datatype/wm/video/renderer",              "wmvrender",   "opt/helix/mediaplatform/wmvrender"))
     # Copy necessary plugins to /opt/helix/mediaplatform/thumbnail directory
-    inst.CopyModuleDlls(
+inst.CopyModuleDlls(
         ("datatype/mp4/video/renderer",             "mp4vrender",  "opt/helix/mediaplatform/thumbnail/mp4vrender"),
         ("datatype/mpg/fileformat",                 "mpgfformat",  "opt/helix/mediaplatform/thumbnail/mpgfformat"))
-    # Put symlinks for the rest of the plugins in /opt/helix/mediaplatform/thumbnail
-    project.writeln("\tln -s ../avc1.so "        + inst.tempdir + "/opt/helix/mediaplatform/thumbnail/avc1.so")
-    inst.AddToFileList("opt/helix/mediaplatform/thumbnail/avc1.so")
-    project.writeln("\tln -s ../dmp4.so "        + inst.tempdir + "/opt/helix/mediaplatform/thumbnail/dmp4.so")
-    inst.AddToFileList("opt/helix/mediaplatform/thumbnail/dmp4.so")
-    project.writeln("\tln -s ../h264dec.so "     + inst.tempdir + "/opt/helix/mediaplatform/thumbnail/h264dec.so")
-    inst.AddToFileList("opt/helix/mediaplatform/thumbnail/h264dec.so")
-    project.writeln("\tln -s ../mp4v.so "        + inst.tempdir + "/opt/helix/mediaplatform/thumbnail/mp4v.so")
-    inst.AddToFileList("opt/helix/mediaplatform/thumbnail/mp4v.so")
-    project.writeln("\tln -s ../wmv8.so "        + inst.tempdir + "/opt/helix/mediaplatform/thumbnail/wmv8.so")
-    inst.AddToFileList("opt/helix/mediaplatform/thumbnail/wmv8.so")
-    project.writeln("\tln -s ../wmv9.so "        + inst.tempdir + "/opt/helix/mediaplatform/thumbnail/wmv9.so")
-    inst.AddToFileList("opt/helix/mediaplatform/thumbnail/wmv9.so")
-    project.writeln("\tln -s ../wmvrender.so "   + inst.tempdir + "/opt/helix/mediaplatform/thumbnail/wmvrender.so")
-    inst.AddToFileList("opt/helix/mediaplatform/thumbnail/wmvrender.so")
+
+# Put symlinks for the rest of the plugins in /opt/helix/mediaplatform/thumbnail
+project.writeln("\tln -s ../avc1.so "        + inst.tempdir + "/opt/helix/mediaplatform/thumbnail/avc1.so")
+inst.AddToFileList("opt/helix/mediaplatform/thumbnail/avc1.so")
+project.writeln("\tln -s ../dmp4.so "        + inst.tempdir + "/opt/helix/mediaplatform/thumbnail/dmp4.so")
+inst.AddToFileList("opt/helix/mediaplatform/thumbnail/dmp4.so")
+project.writeln("\tln -s ../h264dec.so "     + inst.tempdir + "/opt/helix/mediaplatform/thumbnail/h264dec.so")
+inst.AddToFileList("opt/helix/mediaplatform/thumbnail/h264dec.so")
+project.writeln("\tln -s ../mp4v.so "        + inst.tempdir + "/opt/helix/mediaplatform/thumbnail/mp4v.so")
+inst.AddToFileList("opt/helix/mediaplatform/thumbnail/mp4v.so")
+project.writeln("\tln -s ../wmv8.so "        + inst.tempdir + "/opt/helix/mediaplatform/thumbnail/wmv8.so")
+inst.AddToFileList("opt/helix/mediaplatform/thumbnail/wmv8.so")
+project.writeln("\tln -s ../wmv9.so "        + inst.tempdir + "/opt/helix/mediaplatform/thumbnail/wmv9.so")
+inst.AddToFileList("opt/helix/mediaplatform/thumbnail/wmv9.so")
+project.writeln("\tln -s ../wmvrender.so "   + inst.tempdir + "/opt/helix/mediaplatform/thumbnail/wmvrender.so")
+inst.AddToFileList("opt/helix/mediaplatform/thumbnail/wmvrender.so")
 
 # Create the MID directories in the temporary file structure
 inst.MakeDirs("usr",
@@ -669,12 +653,6 @@
     project.writeln("\tln -s ../rppluginapplication.so " + inst.tempdir + "/opt/helix/mediaplatform/thumbnail/rppluginapplication.so")
     inst.AddToFileList("opt/helix/mediaplatform/thumbnail/rppluginapplication.so")
 
-# In the LitePlayer build we build two .so's which
-# have the same name as existing .so's, so we have
-# to overwrite these
-inst.CopyMultiFiles(distdir,
-                    "opt/helix/mediaplatform",
-                    "hxmedpltfm.so")
 # If the LitePlayer is not using the hardware-accelerated
 # renderers, then we need to put a link in the thumbnail 
 # directory back up to the mediaplatform directory