Author: andre
Date: 2010-06-08 11:27:27 +0200 (Tue, 08 Jun 2010)
New Revision: 42439
Modified:
mmbase/trunk/applications/media/src/main/config/builders/media/mediasources.virtual.fields.xml
mmbase/trunk/applications/media/src/main/config/builders/media/mediasources.xml
mmbase/trunk/applications/media/src/main/config/builders/media/videosources.xml
Log:
new field audio codec, ordering of fields in editors
Modified:
mmbase/trunk/applications/media/src/main/config/builders/media/mediasources.virtual.fields.xml
===================================================================
---
mmbase/trunk/applications/media/src/main/config/builders/media/mediasources.virtual.fields.xml
2010-06-08 09:26:17 UTC (rev 42438)
+++
mmbase/trunk/applications/media/src/main/config/builders/media/mediasources.virtual.fields.xml
2010-06-08 09:27:27 UTC (rev 42439)
@@ -65,6 +65,14 @@
<field name="objecttype" state="virtual">
+ <descriptions>
+ <description xml:lang="nl">Status en beschikbaarheid van de
source</description>
+ <description xml:lang="en">State and availability of the
source</description>
+ </descriptions>
+ <gui>
+ <guiname xml:lang="nl">Status</guiname>
+ <guiname xml:lang="en">State</guiname>
+ </gui>
<datatype base="objecttype" xmlns="http://www.mmbase.org/xmlns/datatypes";>
<pattern value="videosources|audiosources" />
<commitprocessor>
Modified:
mmbase/trunk/applications/media/src/main/config/builders/media/mediasources.xml
===================================================================
---
mmbase/trunk/applications/media/src/main/config/builders/media/mediasources.xml
2010-06-08 09:26:17 UTC (rev 42438)
+++
mmbase/trunk/applications/media/src/main/config/builders/media/mediasources.xml
2010-06-08 09:27:27 UTC (rev 42439)
@@ -43,12 +43,17 @@
met de extensie van het bronbestand.
</description>
</descriptions>
-
<gui>
<guiname xml:lang="en">Format</guiname>
<guiname xml:lang="nl">Formaat</guiname>
</gui>
- <editor><positions><list>1</list></positions></editor>
+ <editor>
+ <positions>
+ <list>1</list>
+ <input>1</input>
+ <search>1</search>
+ </positions>
+ </editor>
<datatype base="integer" xmlns="http://www.mmbase.org/xmlns/datatypes";>
<enumeration>
<entry
@@ -76,6 +81,12 @@
<guiname xml:lang="en">Codec</guiname>
<guiname xml:lang="nl">Codec</guiname>
</gui>
+ <editor>
+ <positions>
+ <input>2</input>
+ <search>2</search>
+ </positions>
+ </editor>
<datatype base="integer" xmlns="http://www.mmbase.org/xmlns/datatypes";>
<default value="UNKNOWN" />
<enumeration>
@@ -86,7 +97,6 @@
</datatype>
</field>
-
<field name="bitrate">
<descriptions>
<description xml:lang="en">
@@ -100,6 +110,12 @@
<guiname xml:lang="en">Bitrate</guiname>
<guiname xml:lang="nl">Bitrate</guiname>
</gui>
+ <editor>
+ <positions>
+ <input>4</input>
+ <search>4</search>
+ </positions>
+ </editor>
<datatype base="integer" xmlns="http://www.mmbase.org/xmlns/datatypes";>
<required value="false" />
<minExclusive value="0" />
@@ -115,6 +131,12 @@
<guiname xml:lang="en">Channels</guiname>
<guiname xml:lang="nl">Kanalen</guiname>
</gui>
+ <editor>
+ <positions>
+ <input>5</input>
+ <search>5</search>
+ </positions>
+ </editor>
<datatype base="integer" xmlns="http://www.mmbase.org/xmlns/datatypes";>
<enumeration>
<entry
basename="org.mmbase.applications.media.builders.resources.channels" />
@@ -137,7 +159,13 @@
<guiname xml:lang="en">Url</guiname>
<guiname xml:lang="nl">Url</guiname>
</gui>
- <editor><positions><list>7</list></positions></editor>
+ <editor>
+ <positions>
+ <list>3</list>
+ <input>3</input>
+ <search>3</search>
+ </positions>
+ </editor>
<datatype base="eline" xmlns="http://www.mmbase.org/xmlns/datatypes";>
<required value="true" />
<maxLength value="255" />
@@ -157,7 +185,13 @@
<guiname xml:lang="en">State</guiname>
<guiname xml:lang="nl">Status</guiname>
</gui>
- <editor><positions><list>8</list></positions></editor>
+ <editor>
+ <positions>
+ <list>5</list>
+ <input>5</input>
+ <search>5</search>
+ </positions>
+ </editor>
<datatype base="integer" xmlns="http://www.mmbase.org/xmlns/datatypes";>
<default value="UNDEFINED" />
<enumeration enforce="onchange">
@@ -180,7 +214,9 @@
</gui>
<editor>
<positions>
- <list>9</list>
+ <list>4</list>
+ <input>4</input>
+ <search>4</search>
</positions>
</editor>
<datatype base="filesize" xmlns="http://www.mmbase.org/xmlns/datatypes";
/>
Modified:
mmbase/trunk/applications/media/src/main/config/builders/media/videosources.xml
===================================================================
---
mmbase/trunk/applications/media/src/main/config/builders/media/videosources.xml
2010-06-08 09:26:17 UTC (rev 42438)
+++
mmbase/trunk/applications/media/src/main/config/builders/media/videosources.xml
2010-06-08 09:27:27 UTC (rev 42439)
@@ -23,6 +23,36 @@
</properties>
<fieldlist>
+
+ <field name="acodec">
+ <descriptions>
+ <description xml:lang="en">
+ Codec used to encode the audio stream in this video file.
+ </description>
+ <description xml:lang="nl">
+ De codec die gebruikt is om de audiostream in dit video bestand te
encoderen.
+ </description>
+ </descriptions>
+ <gui>
+ <guiname xml:lang="en">Audio codec</guiname>
+ <guiname xml:lang="nl">Audiocodec</guiname>
+ </gui>
+ <editor>
+ <positions>
+ <input>3</input>
+ <search>3</search>
+ </positions>
+ </editor>
+ <datatype base="integer" xmlns="http://www.mmbase.org/xmlns/datatypes";>
+ <default value="UNKNOWN" />
+ <enumeration>
+ <entry
+ javaconstants="org.mmbase.applications.media.Codec"
+ basename="org.mmbase.applications.media.resources.codecs" />
+ </enumeration>
+ </datatype>
+ </field>
+
<field name="fps">
<descriptions>
<description xml:lang="en">Frames per second</description>
@@ -33,14 +63,16 @@
<guiname xml:lang="nl">FPS</guiname>
</gui>
<editor>
- <positions><list>10</list></positions>
+ <positions>
+ <input>4</input>
+ <search>4</search>
+ </positions>
</editor>
<datatype base="integer" xmlns="http://www.mmbase.org/xmlns/datatypes";>
<minInclusive value="0" />
</datatype>
</field>
-
<field name="height">
<descriptions>
<description xml:lang="en">Height in pixels</description>
@@ -52,7 +84,8 @@
</gui>
<editor>
<positions>
- <list>11</list>
+ <input>5</input>
+ <search>5</search>
</positions>
</editor>
<datatype base="integer" xmlns="http://www.mmbase.org/xmlns/datatypes";>
@@ -71,7 +104,8 @@
</gui>
<editor>
<positions>
- <list>12</list>
+ <input>5</input>
+ <search>5</search>
</positions>
</editor>
<datatype base="integer" xmlns="http://www.mmbase.org/xmlns/datatypes";>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
