1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
|
diff -Nur banshee-2.6.2.orig/configure banshee-2.6.2/configure
--- banshee-2.6.2.orig/configure 2014-02-18 20:18:09.000000000 -0200
+++ banshee-2.6.2/configure 2016-01-28 10:05:18.263004034 -0300
@@ -21159,7 +21159,7 @@
-ac_config_files="$ac_config_files Makefile build/Makefile build/m4/Makefile build/m4/shave/shave build/m4/shave/shave-libtool build/pkg-config/Makefile data/Makefile data/org.bansheeproject.Banshee.service data/org.bansheeproject.CollectionIndexer.service data/audio-profiles/Makefile data/desktop-files/Makefile data/desktop-files/common.desktop data/icon-theme-hicolor/Makefile help/Makefile docs/Makefile docs/Hyena/Makefile docs/Banshee/Makefile po/Makefile.in tests/Makefile tests/Analyzer/Makefile tests/Performance/Makefile extras/Makefile libbanshee/Makefile src/Hyena/Makefile src/Hyena/build/Makefile src/Hyena/build/pkg-config/Makefile src/Hyena/build/m4/Makefile src/Hyena/Hyena/Makefile src/Hyena/Hyena.Data.Sqlite/Makefile src/Hyena/Hyena.Gui/Makefile src/Makefile src/AssemblyInfo.cs src/Clients/Makefile src/Clients/Beroe/Makefile src/Clients/Booter/Makefile src/Clients/Booter/banshee.linux src/Clients/Booter/banshee.darwin src/Clients/Halie/Makefile src/Clients/Muinshee/Makefile src/Clients/Nereid/Makefile src/Clients/MeeGo/Makefile src/Core/Makefile src/Core/Banshee.CollectionIndexer/Makefile src/Core/Banshee.Core/Makefile src/Core/Banshee.Services/Makefile src/Core/Banshee.ThickClient/Makefile src/Core/Banshee.Widgets/Makefile src/Core/Banshee.WebBrowser/Makefile src/Core/Banshee.WebBrowser/libossifer/Makefile src/Backends/Makefile src/Backends/Banshee.Gio/Makefile src/Backends/Banshee.Gnome/Makefile src/Backends/Banshee.GStreamer/Makefile src/Backends/Banshee.GStreamerSharp/Makefile src/Backends/Banshee.Unix/Makefile src/Backends/Banshee.Osx/Makefile src/Backends/Banshee.NowPlaying.X11/Makefile src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile src/Backends/Banshee.Windows/Makefile src/Libraries/Makefile src/Libraries/Lastfm/Makefile src/Libraries/Lastfm.Gui/Makefile src/Libraries/Migo/Makefile src/Libraries/Mono.Media/Makefile src/Libraries/Mtp/Makefile src/Libraries/Mtp/Mtp.dll.config src/Libraries/MusicBrainz/Makefile src/Dap/Makefile src/Dap/Banshee.Dap/Makefile src/Dap/Banshee.Dap.AppleDevice/Makefile src/Dap/Banshee.Dap.MassStorage/Makefile src/Dap/Banshee.Dap.Mtp/Makefile src/Dap/Banshee.Dap.Karma/Makefile src/Extensions/Makefile src/Extensions/Banshee.AmazonMp3/Makefile src/Extensions/Banshee.AmazonMp3.Store/Makefile src/Extensions/Banshee.Audiobook/Makefile src/Extensions/Banshee.BooScript/Makefile src/Extensions/Banshee.Bpm/Makefile src/Extensions/Banshee.CoverArt/Makefile src/Extensions/Banshee.Daap/Makefile src/Extensions/Banshee.Emusic/Makefile src/Extensions/Banshee.Emusic.Store/Makefile src/Extensions/Banshee.FileSystemQueue/Makefile src/Extensions/Banshee.InternetArchive/Makefile src/Extensions/Banshee.Fixup/Makefile src/Extensions/Banshee.InternetRadio/Makefile src/Extensions/Banshee.Lastfm/Makefile src/Extensions/Banshee.LastfmStreaming/Makefile src/Extensions/Banshee.LibraryWatcher/Makefile src/Extensions/Banshee.MiniMode/Makefile src/Extensions/Banshee.MiroGuide/Makefile src/Extensions/Banshee.MeeGo/Makefile src/Extensions/Banshee.Mpris/Makefile src/Extensions/Banshee.MultimediaKeys/Makefile src/Extensions/Banshee.NotificationArea/Makefile src/Extensions/Banshee.NowPlaying/Makefile src/Extensions/Banshee.OpticalDisc/Makefile src/Extensions/Banshee.PlayQueue/Makefile src/Extensions/Banshee.PlayerMigration/Makefile src/Extensions/Banshee.Podcasting/Makefile src/Extensions/Banshee.SoundMenu/Makefile src/Extensions/Banshee.SqlDebugConsole/Makefile src/Extensions/Banshee.Sample/Makefile src/Extensions/Banshee.Torrent/Makefile src/Extensions/Banshee.RemoteAudio/Makefile src/Extensions/Banshee.UbuntuOneMusicStore/Makefile src/Extensions/Banshee.UPnPClient/Makefile src/Extensions/Banshee.Wikipedia/Makefile src/Extensions/Banshee.YouTube/Makefile extras/metrics/Makefile"
+ac_config_files="$ac_config_files Makefile build/Makefile build/m4/Makefile build/m4/shave/shave build/m4/shave/shave-libtool build/pkg-config/Makefile data/Makefile data/org.bansheeproject.Banshee.service data/org.bansheeproject.CollectionIndexer.service data/audio-profiles/Makefile data/desktop-files/Makefile data/desktop-files/common.desktop data/icon-theme-hicolor/Makefile help/Makefile docs/Makefile docs/Hyena/Makefile docs/Banshee/Makefile po/Makefile.in tests/Makefile tests/Analyzer/Makefile tests/Performance/Makefile extras/Makefile libbanshee/Makefile src/Hyena/Makefile src/Hyena/build/Makefile src/Hyena/build/pkg-config/Makefile src/Hyena/build/m4/Makefile src/Hyena/Hyena/Makefile src/Hyena/Hyena.Data.Sqlite/Makefile src/Hyena/Hyena.Gui/Makefile src/Makefile src/AssemblyInfo.cs src/Clients/Makefile src/Clients/Beroe/Makefile src/Clients/Booter/Makefile src/Clients/Booter/banshee.linux src/Clients/Booter/banshee.darwin src/Clients/Halie/Makefile src/Clients/Muinshee/Makefile src/Clients/Nereid/Makefile src/Clients/MeeGo/Makefile src/Core/Makefile src/Core/Banshee.CollectionIndexer/Makefile src/Core/Banshee.Core/Makefile src/Core/Banshee.Services/Makefile src/Core/Banshee.ThickClient/Makefile src/Core/Banshee.Widgets/Makefile src/Core/Banshee.WebBrowser/Makefile src/Core/Banshee.WebBrowser/libossifer/Makefile src/Backends/Makefile src/Backends/Banshee.Gio/Makefile src/Backends/Banshee.Gnome/Makefile src/Backends/Banshee.GStreamer/Makefile src/Backends/Banshee.GStreamerSharp/Makefile src/Backends/Banshee.Unix/Makefile src/Backends/Banshee.Osx/Makefile src/Backends/Banshee.NowPlaying.X11/Makefile src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile src/Backends/Banshee.Windows/Makefile src/Libraries/Makefile src/Libraries/Lastfm/Makefile src/Libraries/Lastfm.Gui/Makefile src/Libraries/Migo/Makefile src/Libraries/Mono.Media/Makefile src/Libraries/Mtp/Makefile src/Libraries/Mtp/Mtp.dll.config src/Libraries/MusicBrainz/Makefile src/Dap/Makefile src/Dap/Banshee.Dap/Makefile src/Dap/Banshee.Dap.AppleDevice/Makefile src/Dap/Banshee.Dap.MassStorage/Makefile src/Dap/Banshee.Dap.Mtp/Makefile src/Dap/Banshee.Dap.Karma/Makefile src/Extensions/Makefile src/Extensions/Banshee.Audiobook/Makefile src/Extensions/Banshee.BooScript/Makefile src/Extensions/Banshee.Bpm/Makefile src/Extensions/Banshee.CoverArt/Makefile src/Extensions/Banshee.Daap/Makefile src/Extensions/Banshee.Emusic/Makefile src/Extensions/Banshee.Emusic.Store/Makefile src/Extensions/Banshee.FileSystemQueue/Makefile src/Extensions/Banshee.InternetArchive/Makefile src/Extensions/Banshee.Fixup/Makefile src/Extensions/Banshee.InternetRadio/Makefile src/Extensions/Banshee.Lastfm/Makefile src/Extensions/Banshee.LastfmStreaming/Makefile src/Extensions/Banshee.LibraryWatcher/Makefile src/Extensions/Banshee.MiniMode/Makefile src/Extensions/Banshee.MiroGuide/Makefile src/Extensions/Banshee.MeeGo/Makefile src/Extensions/Banshee.Mpris/Makefile src/Extensions/Banshee.MultimediaKeys/Makefile src/Extensions/Banshee.NotificationArea/Makefile src/Extensions/Banshee.NowPlaying/Makefile src/Extensions/Banshee.OpticalDisc/Makefile src/Extensions/Banshee.PlayQueue/Makefile src/Extensions/Banshee.PlayerMigration/Makefile src/Extensions/Banshee.Podcasting/Makefile src/Extensions/Banshee.SoundMenu/Makefile src/Extensions/Banshee.SqlDebugConsole/Makefile src/Extensions/Banshee.Sample/Makefile src/Extensions/Banshee.Torrent/Makefile src/Extensions/Banshee.RemoteAudio/Makefile src/Extensions/Banshee.UbuntuOneMusicStore/Makefile src/Extensions/Banshee.UPnPClient/Makefile src/Extensions/Banshee.Wikipedia/Makefile src/Extensions/Banshee.YouTube/Makefile extras/metrics/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -22522,8 +22522,6 @@
"src/Dap/Banshee.Dap.Mtp/Makefile") CONFIG_FILES="$CONFIG_FILES src/Dap/Banshee.Dap.Mtp/Makefile" ;;
"src/Dap/Banshee.Dap.Karma/Makefile") CONFIG_FILES="$CONFIG_FILES src/Dap/Banshee.Dap.Karma/Makefile" ;;
"src/Extensions/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Makefile" ;;
- "src/Extensions/Banshee.AmazonMp3/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Banshee.AmazonMp3/Makefile" ;;
- "src/Extensions/Banshee.AmazonMp3.Store/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Banshee.AmazonMp3.Store/Makefile" ;;
"src/Extensions/Banshee.Audiobook/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Banshee.Audiobook/Makefile" ;;
"src/Extensions/Banshee.BooScript/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Banshee.BooScript/Makefile" ;;
"src/Extensions/Banshee.Bpm/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Banshee.Bpm/Makefile" ;;
diff -Nur banshee-2.6.2.orig/configure.ac banshee-2.6.2/configure.ac
--- banshee-2.6.2.orig/configure.ac 2014-02-18 20:16:10.000000000 -0200
+++ banshee-2.6.2/configure.ac 2016-01-28 10:05:24.692721539 -0300
@@ -317,8 +317,6 @@
src/Dap/Banshee.Dap.Karma/Makefile
src/Extensions/Makefile
-src/Extensions/Banshee.AmazonMp3/Makefile
-src/Extensions/Banshee.AmazonMp3.Store/Makefile
src/Extensions/Banshee.Audiobook/Makefile
src/Extensions/Banshee.BooScript/Makefile
src/Extensions/Banshee.Bpm/Makefile
diff -Nur banshee-2.6.2.orig/help/Makefile.am banshee-2.6.2/help/Makefile.am
--- banshee-2.6.2.orig/help/Makefile.am 2014-02-18 18:40:14.000000000 -0200
+++ banshee-2.6.2/help/Makefile.am 2016-01-28 10:26:11.551273284 -0300
@@ -9,7 +9,6 @@
add-podcast.page \
add-radio.page \
advanced.page \
- amazon.page \
emusic.page \
extensions.page \
import.page \
diff -Nur banshee-2.6.2.orig/help/Makefile.in banshee-2.6.2/help/Makefile.in
--- banshee-2.6.2.orig/help/Makefile.in 2014-02-18 20:18:03.000000000 -0200
+++ banshee-2.6.2/help/Makefile.in 2016-01-28 10:26:18.097652333 -0300
@@ -525,7 +525,6 @@
@HAVE_GNOME_DOC_UTILS_TRUE@ add-podcast.page \
@HAVE_GNOME_DOC_UTILS_TRUE@ add-radio.page \
@HAVE_GNOME_DOC_UTILS_TRUE@ advanced.page \
-@HAVE_GNOME_DOC_UTILS_TRUE@ amazon.page \
@HAVE_GNOME_DOC_UTILS_TRUE@ emusic.page \
@HAVE_GNOME_DOC_UTILS_TRUE@ extensions.page \
@HAVE_GNOME_DOC_UTILS_TRUE@ import.page \
diff -Nur banshee-2.6.2.orig/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs banshee-2.6.2/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs
--- banshee-2.6.2.orig/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs 2014-02-18 18:35:24.000000000 -0200
+++ banshee-2.6.2/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs 2016-01-28 10:42:56.130469744 -0300
@@ -55,7 +55,6 @@
private static string [] audio_folders = new string [] {
"Music/",
- "amazonmp3/",
"Video/"
};
@@ -69,17 +68,6 @@
private static string playlists_path = "Music/Playlists/";
- private AmazonMp3GroupSource amazon_source;
- private string amazon_base_dir;
-
- public override void SourceInitialize ()
- {
- amazon_base_dir = System.IO.Path.Combine (Source.Volume.MountPoint, audio_folders[1]);
-
- amazon_source = new AmazonMp3GroupSource (Source, "amazonmp3", amazon_base_dir);
- amazon_source.AutoHide = true;
- }
-
public override bool LoadDeviceConfiguration ()
{
LoadConfig ();
@@ -156,31 +144,5 @@
return true;
}
-#region Amazon MP3 Store Purchased Tracks Management
-
- public override bool DeleteTrackHook (DatabaseTrackInfo track)
- {
- // Do not allow removing purchased tracks if not in the
- // Amazon Purchased Music source; this should prevent
- // accidental deletion of purchased music that may not
- // have been copied from the device yet.
- //
- // TODO: Provide some feedback when a purchased track is
- // skipped from deletion
- //
- // FIXME: unfortunately this does not work due to
- // the cache models being potentially different
- // even though they will always reference the same tracks
- // amazon_source.TrackModel.IndexOf (track) >= 0
-
- if (!amazon_source.Active && amazon_source.Count > 0 && track.Uri.LocalPath.StartsWith (amazon_base_dir)) {
- return false;
- }
-
- return true;
- }
-
-#endregion
-
}
}
diff -Nur banshee-2.6.2.orig/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/WebOSDevice.cs banshee-2.6.2/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/WebOSDevice.cs
--- banshee-2.6.2.orig/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/WebOSDevice.cs 2014-02-18 18:35:24.000000000 -0200
+++ banshee-2.6.2/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/WebOSDevice.cs 2016-01-28 10:43:27.961879764 -0300
@@ -86,8 +86,7 @@
private static string [] audio_folders = new string [] {
"Music/",
"Videos/",
- //"ringtones/",
- "AmazonMP3/"
+ //"ringtones/"
};
private static string [] video_folders = new string [] {
@@ -98,22 +97,8 @@
"phone-palm-pre", DapSource.FallbackIcon
};
- private AmazonMp3GroupSource amazon_source;
- private string amazon_base_dir;
-
private RingtonesGroupSource ringtones_source;
- public override void SourceInitialize ()
- {
- amazon_base_dir = System.IO.Path.Combine (Source.Volume.MountPoint, audio_folders[2]);
-
- amazon_source = new AmazonMp3GroupSource (Source, "AmazonMP3", amazon_base_dir);
- amazon_source.AutoHide = true;
-
- ringtones_source = new RingtonesGroupSource (Source);
- ringtones_source.AutoHide = true;
- }
-
public override bool LoadDeviceConfiguration ()
{
LoadConfig ();
@@ -161,31 +146,6 @@
return icon_names;
}
-#region Amazon MP3 Store Purchased Tracks Management
-
- public override bool DeleteTrackHook (DatabaseTrackInfo track)
- {
- // Do not allow removing purchased tracks if not in the
- // Amazon Purchased Music source; this should prevent
- // accidental deletion of purchased music that may not
- // have been copied from the device yet.
- //
- // TODO: Provide some feedback when a purchased track is
- // skipped from deletion
- //
- // FIXME: unfortunately this does not work due to
- // the cache models being potentially different
- // even though they will always reference the same tracks
- // amazon_source.TrackModel.IndexOf (track) >= 0
- if (!amazon_source.Active && amazon_source.Count > 0 && track.Uri.LocalPath.StartsWith (amazon_base_dir)) {
- return false;
- }
-
- return true;
- }
-
-#endregion
-
#region Ringtones Support
private class RingtonesGroupSource : MediaGroupSource
diff -Nur banshee-2.6.2.orig/src/Dap/Banshee.Dap.MassStorage/Makefile.am banshee-2.6.2/src/Dap/Banshee.Dap.MassStorage/Makefile.am
--- banshee-2.6.2.orig/src/Dap/Banshee.Dap.MassStorage/Makefile.am 2014-02-18 18:40:14.000000000 -0200
+++ banshee-2.6.2/src/Dap/Banshee.Dap.MassStorage/Makefile.am 2016-01-28 10:36:41.750251726 -0300
@@ -4,7 +4,6 @@
INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
SOURCES = \
- Banshee.Dap.MassStorage/AmazonMp3GroupSource.cs \
Banshee.Dap.MassStorage/AndroidDevice.cs \
Banshee.Dap.MassStorage/CustomMassStorageDevice.cs \
Banshee.Dap.MassStorage/DeviceMapper.cs \
diff -Nur banshee-2.6.2.orig/src/Dap/Banshee.Dap.MassStorage/Makefile.in banshee-2.6.2/src/Dap/Banshee.Dap.MassStorage/Makefile.in
--- banshee-2.6.2.orig/src/Dap/Banshee.Dap.MassStorage/Makefile.in 2014-02-18 20:18:05.000000000 -0200
+++ banshee-2.6.2/src/Dap/Banshee.Dap.MassStorage/Makefile.in 2016-01-28 10:33:46.404622326 -0300
@@ -422,7 +422,6 @@
LINK = $(REF_DAP_MASS_STORAGE) $(am__append_1)
INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
SOURCES = \
- Banshee.Dap.MassStorage/AmazonMp3GroupSource.cs \
Banshee.Dap.MassStorage/AndroidDevice.cs \
Banshee.Dap.MassStorage/CustomMassStorageDevice.cs \
Banshee.Dap.MassStorage/DeviceMapper.cs \
@@ -557,9 +556,6 @@
REF_DAP_KARMA = $(LINK_DAP_DEPS) $(LINK_KARMA_DEPS)
# Extensions
-LINK_EXTENSION_AMAZONMP3 = -r:$(DIR_BIN)/Banshee.AmazonMp3.exe
-REF_EXTENSION_AMAZONMP3 = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_AMAZONMP3_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_AMAZONMP3)
REF_EXTENSION_BOOSCRIPT = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BOO)
REF_EXTENSION_BPM = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_COVERART = $(LINK_BANSHEE_THICKCLIENT_DEPS)
diff -Nur banshee-2.6.2.orig/src/Extensions/Makefile.am banshee-2.6.2/src/Extensions/Makefile.am
--- banshee-2.6.2.orig/src/Extensions/Makefile.am 2014-02-18 18:40:14.000000000 -0200
+++ banshee-2.6.2/src/Extensions/Makefile.am 2016-01-28 10:05:54.838063750 -0300
@@ -1,6 +1,4 @@
SUBDIRS = \
- Banshee.AmazonMp3 \
- Banshee.AmazonMp3.Store \
Banshee.Audiobook \
Banshee.BooScript \
Banshee.Bpm \
diff -Nur banshee-2.6.2.orig/src/Extensions/Makefile.in banshee-2.6.2/src/Extensions/Makefile.in
--- banshee-2.6.2.orig/src/Extensions/Makefile.in 2014-02-18 20:18:07.000000000 -0200
+++ banshee-2.6.2/src/Extensions/Makefile.in 2016-01-28 10:06:01.174452024 -0300
@@ -424,8 +424,6 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = \
- Banshee.AmazonMp3 \
- Banshee.AmazonMp3.Store \
Banshee.Audiobook \
Banshee.BooScript \
Banshee.Bpm \
|
