~ubuntu-branches/ubuntu/vivid/banshee/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/Remove-build-time-enable-gapless-playback-option.patch

  • Committer: Package Import Robot
  • Author(s): Chow Loong Jin
  • Date: 2014-02-23 05:13:31 UTC
  • mfrom: (1.2.27) (6.4.31 sid)
  • Revision ID: package-import@ubuntu.com-20140223051331-ht592rolvjahlhoq
Tags: 2.9.0+really2.6.2-0ubuntu1
* [fa3da3c] Merge from Debian Experimental, remaining changes:
  - Enable and recommend SoundMenu and Disable NotificationArea by default
  - Disable boo and karma extensions
  - Move desktop file for Meego UI to /usr/share/une/applications
  - Change the url for the Amazon store redirector
  - [9b356d6] Add workaround for set_Height exception.
  - [ccbcbbd] Make Banshee translatable in Launchpad
  - [2094ee5] Bump libgpod build-dep version to 0.8.2-7~
  - [a7156c0] Filter out libgpod-cil-dev versions built against gtk#3
  - [e7c634d] Update dversionmangle for extracting +really version out

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 7 files changed, 10 insertions(+), 63 deletions(-)
17
17
 
18
18
diff --git a/configure.ac b/configure.ac
19
 
index f36063e..f698ccd 100644
 
19
index e9c34b1..5e272ba 100644
20
20
--- a/configure.ac
21
21
+++ b/configure.ac
22
 
@@ -171,21 +171,6 @@ BANSHEE_CHECK_SOUNDMENU
 
22
@@ -172,21 +172,6 @@ BANSHEE_CHECK_SOUNDMENU
23
23
 dnl Ubuntu One Music Store (optional)
24
24
 BANSHEE_CHECK_UBUNTUONE
25
25
 
57
57
 bansheelib_LTLIBRARIES = libbanshee.la
58
58
 
59
59
diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c
60
 
index 6c2af35..d4977e1 100644
 
60
index 018bcd2..28bae33 100644
61
61
--- a/libbanshee/banshee-player-pipeline.c
62
62
+++ b/libbanshee/banshee-player-pipeline.c
63
63
@@ -239,7 +239,6 @@ bp_pipeline_bus_callback (GstBus *bus, GstMessage *message, gpointer userdata)
111
111
 {
112
112
     g_return_val_if_fail (IS_BANSHEE_PLAYER (player), FALSE);
113
113
diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
114
 
index 278ff51..05b1905 100644
 
114
index 806093a..5181f2b 100644
115
115
--- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
116
116
+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
117
 
@@ -747,16 +747,11 @@ namespace Banshee.GStreamer
 
117
@@ -758,16 +758,11 @@ namespace Banshee.GStreamer
118
118
             get { return gapless_enabled; }
119
119
             set
120
120
             {
135
135
                 }
136
136
             }
137
137
         }
138
 
@@ -881,13 +876,11 @@ namespace Banshee.GStreamer
 
138
@@ -892,13 +887,11 @@ namespace Banshee.GStreamer
139
139
                 Catalog.GetString ("For tracks that have ReplayGain data, automatically scale (normalize) playback volume"),
140
140
                 delegate { ReplayGainEnabled = ReplayGainEnabledSchema.Get (); }
141
141
             ));
154
154
         }
155
155
 
156
156
         private void UninstallPreferences ()
157
 
@@ -898,9 +891,7 @@ namespace Banshee.GStreamer
 
157
@@ -909,9 +902,7 @@ namespace Banshee.GStreamer
158
158
             }
159
159
 
160
160
             service["general"]["misc"].Remove (replaygain_preference);
165
165
             replaygain_preference = null;
166
166
             gapless_preference = null;
167
167
         }
168
 
@@ -969,9 +960,6 @@ namespace Banshee.GStreamer
 
168
@@ -980,9 +971,6 @@ namespace Banshee.GStreamer
169
169
             BansheePlayerAboutToFinishCallback cb);
170
170
 
171
171
         [DllImport ("libbanshee.dll")]