From adb7d83292e1502ca7c21a123b104412cb22d160 Mon Sep 17 00:00:00 2001
From: geronimo <geronimo013@gmx.de>
Date: Thu, 2 Aug 2012 08:07:59 +0200
Subject: worked out processing of some meta data, extended json list elements

---
 cmps/nbproject/configurations.xml       | 15 +++++++++++++++
 cmps/serverlib/src/JSonListAssembler.cc |  3 +++
 cmps/tests/MetaScanTest.cc              | 12 ------------
 3 files changed, 18 insertions(+), 12 deletions(-)

(limited to 'cmps')

diff --git a/cmps/nbproject/configurations.xml b/cmps/nbproject/configurations.xml
index 8f12212..de3675f 100644
--- a/cmps/nbproject/configurations.xml
+++ b/cmps/nbproject/configurations.xml
@@ -341,6 +341,21 @@
           <output>${TESTDIR}/TestFiles/stringBuilderTest</output>
         </linkerTool>
       </folder>
+      <folder path="TestFiles/f8">
+        <cTool>
+          <incDir>
+            <pElem>.</pElem>
+          </incDir>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>.</pElem>
+          </incDir>
+        </ccTool>
+        <linkerTool>
+          <output>${TESTDIR}/TestFiles/f8</output>
+        </linkerTool>
+      </folder>
     </conf>
     <conf name="Release" type="1">
       <toolsSet>
diff --git a/cmps/serverlib/src/JSonListAssembler.cc b/cmps/serverlib/src/JSonListAssembler.cc
index 6cba0bb..bdeb7b9 100644
--- a/cmps/serverlib/src/JSonListAssembler.cc
+++ b/cmps/serverlib/src/JSonListAssembler.cc
@@ -64,6 +64,9 @@ bool cJSonListAssembler::AddElement(cStringBuilder &sb, void *ListElement, bool
      writer->Object();
      writer->Key("name").Value(m->Name());
      writer->Key("type").Value(m->MediaType());
+     writer->Key("format").Value(m->Format());
+     writer->Key("width").Value(m->Width());
+     writer->Key("height").Value(m->Height());
      writer->Key("path").Value(m->URI());
      writer->EndObject();
 
diff --git a/cmps/tests/MetaScanTest.cc b/cmps/tests/MetaScanTest.cc
index 1b57752..c207d5c 100644
--- a/cmps/tests/MetaScanTest.cc
+++ b/cmps/tests/MetaScanTest.cc
@@ -39,22 +39,10 @@
 
 void parseConfig(const char *FileName)
 {
-#ifdef OLD_STUFF
-  cConfigReader *cr = new cConfigReader(new cLineReader(new cFileReader(new cFile(FileName))));
-  cConfigReader::ConfigEntry *ce;
-
-  while ((ce = cr->ReadEntry())) {
-        std::cout << "config entry [" << std::get<0>(*ce) << "] => " << std::get<1>(*ce) << std::endl;
-        delete ce;
-        }
-  cr->Close();
-  delete cr;
-#else
   cMediaServerConfig msc("/var/lib/cmp");
 
   msc.Load("srserver.conf");
   msc.Dump();
-#endif
 }
 
 void dumpTextfile(const char *FileName)
-- 
cgit v1.2.3