hal: Branch 'origin' - 2 commits

[Richard Hughes]

 fdi/information/10freedesktop/10-usb-music-players.fdi |   12 ++++++++++++
 1 files changed, 12 insertions(+)

New commits:
diff-tree d2f814dfe71cd13daf66188ab6360b3b73280c99 (from d1f6326099eff8392a8fb706bdd67baa11c9ec88)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Jul 3 11:02:29 2007 +0200

    cleaned up Maxfield MAX-SIN TOUCH entry
    
    Removed line from the Maxfield MAX-SIN TOUCH entry. Don't add audio/mpeg to
    portable_audio_player.output_formats in the player block/entry, this get
    already added for all music players.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 3ccc1a5..862e62d 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -789,7 +789,6 @@
           <match key="@storage.originating_device:usb.product_id" int="0x0110">
             <merge key="portable_audio_player.type" type="string">generic</merge>
             <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
             <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
diff-tree d1f6326099eff8392a8fb706bdd67baa11c9ec88 (from 3b5fc843e63dee19e0c7ce06f1c6b1f2d7cb6b8e)
Author: David Zeuthen <davidz at redhat.com>
Date:   Mon Jul 2 18:48:19 2007 -0400

    add Maxfield MAX-SIN TOUCH information
    
    From Daniel Frey via Martin Pitt:
    
    From: 	Martin Pitt <martin.pitt at ubuntu.com>
    To: 	hal at lists.freedesktop.org
    Subject: 	Fwd: fdi information for Maxfield MAX-SIN T
    Date: 	Fri, 29 Jun 2007 13:42:22 +0200 (07:42 EDT)
    Mailer: 	Mutt/1.5.15+20070412 (2007-04-11)
    
    Hello hal developers,
    
    I just discovered this old mail in my mailbox. This would make a nice
    addition to hal-info.
    
    Thank you!
    
    Martin
    
    ----- Forwarded message from Daniel Frey <d.frey at gmx.de> -----
    
    X-Spam-Status: No, score=2.0 required=4.0 tests=BAYES_80 autolearn=no
            version=3.1.7-deb
    Date: Wed, 18 Apr 2007 22:06:29 +0200
    From: Daniel Frey <d.frey at gmx.de>
    To: martin.pitt at ubuntu.com
    Subject: fdi information for Maxfield MAX-SIN T
    
    Hi Martin,
    
    in case you are interested, the following addition to
    /usr/share/hal/fdi/information/10freedesktop/10-usb-music-players.fdi
    allows me to use my Maxfield MAX-SIN TOUCH with Rhythmbox:
    
          <!-- Maxfield -->
          <match key="@storage.physical_device:usb.vendor_id" int="0x1890">
            <!-- Maxfield MAX-SIN TOUCH -->
            <match key="@storage.physical_device:usb.product_id" int="0x0110">
            <append key="info.capabilities" type="strlist">portable_audio_player</append>
            <merge key="info.category" type="string">portable_audio_player</merge>
            <merge key="portable_audio_player.type" type="string">generic</merge>
            <merge key="portable_audio_player.access_method" type="string">storage</merge>
            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
            <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
            </match>
          </match>
    
    Hope you don't mind me just writing an EMail. If you need more
    information or would prefer using Launchpad (or whatever is
    appropriate), just let me know...
    
    Regards, Daniel
    
    ----- End forwarded message -----

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 5ff6d3a..3ccc1a5 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -783,6 +783,19 @@
           </match>
         </match>
 
+        <!-- Maxfield -->
+        <match key="@storage.originating_device:usb.vendor_id" int="0x1890">
+          <!-- Maxfield MAX-SIN TOUCH -->
+          <match key="@storage.originating_device:usb.product_id" int="0x0110">
+            <merge key="portable_audio_player.type" type="string">generic</merge>
+            <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+            <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+          </match>
+        </match>
+
         <!-- Motorola -->
         <match key="@storage.originating_device:usb.vendor_id" int="0x22b8">
           <!-- Motorola iTunes enabled phone -->