From ef942e5cce0c44bcb41187c21f7ca2733048309c Mon Sep 17 00:00:00 2001
From: Jonathan Ernst <jonathan@ernstfamily.ch>
Date: Tue, 12 Oct 2010 09:18:23 +0200
Subject: Cleanup Sandisk devices
 Remove MTP USB Ids
 Split devices to have correct names
 Add new devices

https://bugs.freedesktop.org/show_bug.cgi?id=30792
---
 media-players/sandisk-7301_7302.mpi                |   10 ----------
 media-players/sandisk-7401_7421_7431.mpi           |   10 ----------
 ...isk-7432_7433_7434_7435_74c0_74c1_74c2_74c3.mpi |   17 -----------------
 media-players/sandisk-sansa_clip-v2.mpi            |   18 ++++++++++++++++++
 media-players/sandisk-sansa_clip.mpi               |    4 ++--
 media-players/sandisk-sansa_clip_plus.mpi          |    4 ++--
 media-players/sandisk-sansa_e100-series.mpi        |   10 ++++++++++
 media-players/sandisk-sansa_e200-series-v2.mpi     |   17 +++++++++++++++++
 media-players/sandisk-sansa_e200-series.mpi        |   17 +++++++++++++++++
 media-players/sandisk-sansa_fuze-v2.mpi            |   18 ++++++++++++++++++
 media-players/sandisk-sansa_fuze.mpi               |   18 ++++++++++++++++++
 media-players/sandisk-sansa_m200-series-v4.mpi     |   10 ++++++++++
 media-players/sandisk-sansa_m200-series.mpi        |   10 ++++++++++
 13 files changed, 122 insertions(+), 41 deletions(-)
 delete mode 100644 media-players/sandisk-7301_7302.mpi
 delete mode 100644 media-players/sandisk-7401_7421_7431.mpi
 delete mode 100644 media-players/sandisk-7432_7433_7434_7435_74c0_74c1_74c2_74c3.mpi
 create mode 100644 media-players/sandisk-sansa_clip-v2.mpi
 create mode 100644 media-players/sandisk-sansa_e100-series.mpi
 create mode 100644 media-players/sandisk-sansa_e200-series-v2.mpi
 create mode 100644 media-players/sandisk-sansa_e200-series.mpi
 create mode 100644 media-players/sandisk-sansa_fuze-v2.mpi
 create mode 100644 media-players/sandisk-sansa_fuze.mpi
 create mode 100644 media-players/sandisk-sansa_m200-series-v4.mpi
 create mode 100644 media-players/sandisk-sansa_m200-series.mpi

diff --git a/media-players/sandisk-7301_7302.mpi b/media-players/sandisk-7301_7302.mpi
deleted file mode 100644
index 8369277..0000000
--- a/media-players/sandisk-7301_7302.mpi
+++ /dev/null
@@ -1,10 +0,0 @@
-[Device]
-Product=Sansa e130, e140
-Vendor=SanDisk
-AccessProtocol=storage
-DeviceMatch=usb:0781:7301;usb:0781:7302;
-
-[Media]
-InputFormats=audio/x-wav
-OutputFormats=audio/mpeg;audio/x-ms-wma;audio/audible;audio/x-wav
-
diff --git a/media-players/sandisk-7401_7421_7431.mpi b/media-players/sandisk-7401_7421_7431.mpi
deleted file mode 100644
index 3fca0ac..0000000
--- a/media-players/sandisk-7401_7421_7431.mpi
+++ /dev/null
@@ -1,10 +0,0 @@
-[Device]
-Product=Sansa m250, m230, e270
-Vendor=SanDisk
-AccessProtocol=storage
-DeviceMatch=usb:0781:7401;usb:0781:7421;usb:0781:7431;
-
-[Media]
-InputFormats=audio/mpeg;audio/x-ms-wma
-OutputFormats=audio/mpeg;audio/x-ms-wma
-
diff --git a/media-players/sandisk-7432_7433_7434_7435_74c0_74c1_74c2_74c3.mpi b/media-players/sandisk-7432_7433_7434_7435_74c0_74c1_74c2_74c3.mpi
deleted file mode 100644
index d95bc31..0000000
--- a/media-players/sandisk-7432_7433_7434_7435_74c0_74c1_74c2_74c3.mpi
+++ /dev/null
@@ -1,17 +0,0 @@
-[Device]
-AccessProtocol=storage
-DeviceMatch=usb:0781:7432;usb:0781:7433;usb:0781:7434;usb:0781:7435;usb:0781:74c0;usb:0781:74c1;usb:0781:74c2;usb:0781:74c3;
-Vendor=SanDisk
-
-[Media]
-InputFormats=audio/x-wav
-OutputFormats=audio/mpeg;audio/x-ms-wma;audio/audible;application/ogg;audio/ogg;audio/flac;audio/x-wav;audio/x-pn-audibleaudio
-
-[Playlist]
-Formats=audio/x-mpegurl
-
-[storage]
-RequiresEject=true
-PlaylistPath=%File
-AudioFolders=MUSIC/;PODCAST/;RECORD/FM/;RECORD/VOICE/;AUDIBLE/;AUDIOBOOKS/
-
diff --git a/media-players/sandisk-sansa_clip-v2.mpi b/media-players/sandisk-sansa_clip-v2.mpi
new file mode 100644
index 0000000..51b959e
--- /dev/null
+++ b/media-players/sandisk-sansa_clip-v2.mpi
@@ -0,0 +1,18 @@
+[Device]
+Product=Sansa Clip V2
+Vendor=SanDisk
+AccessProtocol=storage
+DeviceMatch=usb:0781:7435
+
+[Media]
+InputFormats=audio/x-wav
+OutputFormats=audio/mpeg;audio/x-ms-wma;audio/audible;application/ogg;audio/ogg;audio/flac;audio/x-wav;audio/x-pn-audibleaudio
+
+[Playlist]
+Formats=audio/x-mpegurl
+
+[storage]
+RequiresEject=true
+PlaylistPath=%File
+AudioFolders=MUSIC/;PODCAST/;RECORD/FM/;RECORD/VOICE/;AUDIBLE/;AUDIOBOOKS/
+
diff --git a/media-players/sandisk-sansa_clip.mpi b/media-players/sandisk-sansa_clip.mpi
index b82b25d..df9d8dd 100644
--- a/media-players/sandisk-sansa_clip.mpi
+++ b/media-players/sandisk-sansa_clip.mpi
@@ -1,8 +1,8 @@
 [Device]
-AccessProtocol=storage
-DeviceMatch=usb:0781:7433;
 Product=Sansa Clip
 Vendor=SanDisk
+AccessProtocol=storage
+DeviceMatch=usb:0781:7433;
 
 [Media]
 InputFormats=audio/x-wav
diff --git a/media-players/sandisk-sansa_clip_plus.mpi b/media-players/sandisk-sansa_clip_plus.mpi
index 77fc444..d753eab 100644
--- a/media-players/sandisk-sansa_clip_plus.mpi
+++ b/media-players/sandisk-sansa_clip_plus.mpi
@@ -1,8 +1,8 @@
 [Device]
-AccessProtocol=storage
-DeviceMatch=usb:0781:74d1;
 Product=Sansa Clip+
 Vendor=SanDisk
+AccessProtocol=storage
+DeviceMatch=usb:0781:74d1;
 
 [Media]
 InputFormats=audio/x-wav
diff --git a/media-players/sandisk-sansa_e100-series.mpi b/media-players/sandisk-sansa_e100-series.mpi
new file mode 100644
index 0000000..854c9b3
--- /dev/null
+++ b/media-players/sandisk-sansa_e100-series.mpi
@@ -0,0 +1,10 @@
+[Device]
+Product=Sansa e100 Series
+Vendor=SanDisk
+AccessProtocol=storage
+DeviceMatch=usb:0781:7302;
+
+[Media]
+InputFormats=audio/x-wav
+OutputFormats=audio/mpeg;audio/x-ms-wma;audio/audible;audio/x-wav
+
diff --git a/media-players/sandisk-sansa_e200-series-v2.mpi b/media-players/sandisk-sansa_e200-series-v2.mpi
new file mode 100644
index 0000000..4785f0a
--- /dev/null
+++ b/media-players/sandisk-sansa_e200-series-v2.mpi
@@ -0,0 +1,17 @@
+[Device]
+Product=Sansa e200 Series V2
+Vendor=SanDisk
+AccessProtocol=storage
+DeviceMatch=usb:0781:7423;
+
+[Media]
+OutputFormats=audio/mpeg;audio/x-ms-wma
+
+[Playlist]
+Formats=audio/x-mpegurl
+
+[storage]
+RequiresEject=true
+PlaylistPath=%File
+AudioFolders=MUSIC/;PODCAST/;RECORD/FM/;RECORD/VOICE/;AUDIBLE/;AUDIOBOOKS/
+
diff --git a/media-players/sandisk-sansa_e200-series.mpi b/media-players/sandisk-sansa_e200-series.mpi
new file mode 100644
index 0000000..7ccde7f
--- /dev/null
+++ b/media-players/sandisk-sansa_e200-series.mpi
@@ -0,0 +1,17 @@
+[Device]
+Product=Sansa e200 Series
+Vendor=SanDisk
+AccessProtocol=storage
+DeviceMatch=usb:0781:7421;
+
+[Media]
+OutputFormats=audio/mpeg;audio/x-ms-wma
+
+[Playlist]
+Formats=audio/x-mpegurl
+
+[storage]
+RequiresEject=true
+PlaylistPath=%File
+AudioFolders=MUSIC/;PODCAST/;RECORD/FM/;RECORD/VOICE/;AUDIBLE/;AUDIOBOOKS/
+
diff --git a/media-players/sandisk-sansa_fuze-v2.mpi b/media-players/sandisk-sansa_fuze-v2.mpi
new file mode 100644
index 0000000..0e1c259
--- /dev/null
+++ b/media-players/sandisk-sansa_fuze-v2.mpi
@@ -0,0 +1,18 @@
+[Device]
+Product=Sansa Fuze V2
+Vendor=SanDisk
+AccessProtocol=storage
+DeviceMatch=usb:0781:74c3;
+
+[Media]
+InputFormats=audio/x-wav
+OutputFormats=audio/mpeg;audio/x-ms-wma;audio/audible;application/ogg;audio/ogg;audio/flac;audio/x-wav;audio/x-pn-audibleaudio
+
+[Playlist]
+Formats=audio/x-mpegurl
+
+[storage]
+RequiresEject=true
+PlaylistPath=%File
+AudioFolders=MUSIC/;PODCAST/;RECORD/FM/;RECORD/VOICE/;AUDIBLE/;AUDIOBOOKS/
+
diff --git a/media-players/sandisk-sansa_fuze.mpi b/media-players/sandisk-sansa_fuze.mpi
new file mode 100644
index 0000000..aa21f8f
--- /dev/null
+++ b/media-players/sandisk-sansa_fuze.mpi
@@ -0,0 +1,18 @@
+[Device]
+Product=Sansa Fuze
+Vendor=SanDisk
+AccessProtocol=storage
+DeviceMatch=usb:0781:074c1;
+
+[Media]
+InputFormats=audio/x-wav
+OutputFormats=audio/mpeg;audio/x-ms-wma;audio/audible;application/ogg;audio/ogg;audio/flac;audio/x-wav;audio/x-pn-audibleaudio
+
+[Playlist]
+Formats=audio/x-mpegurl
+
+[storage]
+RequiresEject=true
+PlaylistPath=%File
+AudioFolders=MUSIC/;PODCAST/;RECORD/FM/;RECORD/VOICE/;AUDIBLE/;AUDIOBOOKS/
+
diff --git a/media-players/sandisk-sansa_m200-series-v4.mpi b/media-players/sandisk-sansa_m200-series-v4.mpi
new file mode 100644
index 0000000..4ce4a81
--- /dev/null
+++ b/media-players/sandisk-sansa_m200-series-v4.mpi
@@ -0,0 +1,10 @@
+[Device]
+Product=Sansa m200 Series V4
+Vendor=SanDisk
+AccessProtocol=storage
+DeviceMatch=usb:0781:7431;
+
+[Media]
+InputFormats=audio/mpeg;audio/x-ms-wma
+OutputFormats=audio/mpeg;audio/x-ms-wma
+
diff --git a/media-players/sandisk-sansa_m200-series.mpi b/media-players/sandisk-sansa_m200-series.mpi
new file mode 100644
index 0000000..012223e
--- /dev/null
+++ b/media-players/sandisk-sansa_m200-series.mpi
@@ -0,0 +1,10 @@
+[Device]
+Product=Sansa m200 Series
+Vendor=SanDisk
+AccessProtocol=storage
+DeviceMatch=usb:0781:7401;
+
+[Media]
+InputFormats=audio/mpeg;audio/x-ms-wma
+OutputFormats=audio/mpeg;audio/x-ms-wma
+
-- 
1.7.1