gnome-media-player/vlc-1.1.0-upgrade.patch

   1 Description: Patch to make GNOME Media Player use vlc 1.1.0
   2  This patch makes GNOME Media Player use VLC 1.1.0 to fix FTBFS in
   3  Maverick.
   4 Author: Bilal Akhtar <bilalakhtar96@yahoo.com>
   5
   6 --- a/src/vlc_engine.cc
   7 +++ b/src/vlc_engine.cc
   8 @@ -35,8 +35,6 @@
   9         instance                = NULL;
  10         media_player    = NULL;
  11
  12 -       libvlc_exception_init (&exception);
  13 -
  14         int i = 0;
  15         const char * vlc_argv[50];
  16
  17 @@ -66,18 +64,13 @@
  18                 g_debug("Deinterlacer disabled");
  19         }
  20
  21 -       instance = libvlc_new (i, vlc_argv, &exception);
  22 -       check_exception("To use the VLC engine you must install VLC");
  23 -
  24 -       media_player = libvlc_media_player_new(instance, &exception);
  25 -       check_exception();
  26 +       instance = libvlc_new (i, vlc_argv);
  27
  28 -       libvlc_audio_set_volume(instance, DEFAULT_VOLUME, &exception);
  29 -       check_exception();
  30 +       media_player = libvlc_media_player_new(instance);
  31 +       libvlc_audio_set_volume(media_player, DEFAULT_VOLUME);
  32
  33 -       event_manager = libvlc_media_player_event_manager(media_player, &exception);
  34 -       libvlc_event_attach(event_manager, libvlc_MediaPlayerEndReached, end_reached_callback, NULL, &exception);
  35 -       check_exception();
  36 +       event_manager = libvlc_media_player_event_manager(media_player);
  37 +       libvlc_event_attach(event_manager, libvlc_MediaPlayerEndReached, end_reached_callback, NULL);
  38
  39         g_message("VLC engine created");
  40  }
  41 @@ -103,30 +96,9 @@
  42         g_debug("VLC engine destroyed");
  43  }
  44
  45 -void VlcEngine::check_exception(const Glib::ustring& message)
  46 -{
  47 -       if (libvlc_exception_raised(&exception))
  48 -       {
  49 -               Glib::ustring text;
  50 -               Glib::ustring exception_message = libvlc_exception_get_message(&exception);
  51 -
  52 -               if (message.empty())
  53 -               {
  54 -                       text = exception_message;
  55 -               }
  56 -               else
  57 -               {
  58 -                       text = Glib::ustring::compose("%1: %2", message, exception_message);
  59 -               }
  60 -
  61 -               throw Exception(text);
  62 -       }
  63 -}
  64 -
  65  void VlcEngine::set_window(int window)
  66  {
  67 -       libvlc_media_player_set_xwindow(media_player, window, &exception);
  68 -       check_exception();
  69 +       libvlc_media_player_set_xwindow(media_player, window);
  70  }
  71
  72  void VlcEngine::pause(gboolean state)
  73 @@ -135,13 +107,12 @@
  74         {
  75                 if (state)
  76                 {
  77 -                       libvlc_media_player_pause(media_player, &exception);
  78 +                       libvlc_media_player_pause(media_player);
  79                 }
  80                 else
  81                 {
  82 -                       libvlc_media_player_play(media_player, &exception);
  83 +                       libvlc_media_player_play(media_player);
  84                 }
  85 -               check_exception();
  86         }
  87  }
  88
  89 @@ -149,8 +120,7 @@
  90  {
  91         if (has_media())
  92         {
  93 -               libvlc_media_player_play(media_player, &exception);
  94 -               check_exception();
  95 +               libvlc_media_player_play(media_player);
  96         }
  97  }
  98
  99 @@ -158,17 +128,10 @@
 100  {
 101         if (has_media())
 102         {
 103 -               libvlc_media_t* media = libvlc_media_player_get_media(media_player, &exception);
 104 -               check_exception();
 105 -
 106 -               libvlc_media_player_stop(media_player, &exception);
 107 -               check_exception();
 108 -
 109 -               libvlc_media_player_set_media(media_player, NULL, &exception);
 110 -               check_exception();
 111 -
 112 +               libvlc_media_t* media = libvlc_media_player_get_media(media_player);
 113 +               libvlc_media_player_stop(media_player);
 114 +               libvlc_media_player_set_media(media_player, NULL);
 115                 libvlc_media_release(media);
 116 -               check_exception();
 117         }
 118  }
 119
 120 @@ -181,12 +144,8 @@
 121
 122         stop();
 123
 124 -       libvlc_media_t* media = libvlc_media_new(instance, mrl.c_str(), &exception);
 125 -       check_exception();
 126 -
 127 -       libvlc_media_player_set_media(media_player, media, &exception);
 128 -       check_exception();
 129 -
 130 +       libvlc_media_t* media = libvlc_media_new_path(instance, mrl.c_str());
 131 +       libvlc_media_player_set_media(media_player, media);
 132         libvlc_media_release(media);
 133  }
 134
 135 @@ -206,16 +165,14 @@
 136                 }
 137                 else
 138                 {
 139 -                       libvlc_media_player_set_time(media_player, new_time, &exception);
 140 -                       check_exception();
 141 +                       libvlc_media_player_set_time(media_player, new_time);
 142                 }
 143         }
 144  }
 145
 146  bool VlcEngine::has_media()
 147  {
 148 -       libvlc_media_t* media = libvlc_media_player_get_media(media_player, &exception);
 149 -       check_exception();
 150 +       libvlc_media_t* media = libvlc_media_player_get_media(media_player);
 151         return media != NULL;
 152  }
 153
 154 @@ -225,11 +182,10 @@
 155
 156         if (has_media())
 157         {
 158 -               result = libvlc_media_player_get_time(media_player, &exception);
 159 -               check_exception();
 160 +               result = libvlc_media_player_get_time(media_player);
 161         }
 162
 163 -    return result;
 164 +       return result;
 165  }
 166
 167  int VlcEngine::get_length()
 168 @@ -238,11 +194,10 @@
 169
 170         if (has_media())
 171         {
 172 -               result = libvlc_media_player_get_length(media_player, &exception);
 173 -               check_exception();
 174 +               result = libvlc_media_player_get_length(media_player);
 175         }
 176
 177 -    return result;
 178 +       return result;
 179  }
 180
 181  float VlcEngine::get_percentage()
 182 @@ -251,8 +206,7 @@
 183
 184         if (has_media())
 185         {
 186 -               result = libvlc_media_player_get_position(media_player, &exception);
 187 -               check_exception();
 188 +               result = libvlc_media_player_get_position(media_player);
 189         }
 190
 191         return result;
 192 @@ -262,30 +216,19 @@
 193  {
 194         if (has_media())
 195         {
 196 -               libvlc_media_player_set_position(media_player, percentage, &exception);
 197 -               check_exception();
 198 +               libvlc_media_player_set_position(media_player, percentage);
 199         }
 200  }
 201
 202  void VlcEngine::set_volume(double value)
 203  {
 204 -if (has_media())
 205 -{
 206 -libvlc_audio_set_volume(instance, value, &exception);
 207 -check_exception();
 208 -}
 209 +       if (has_media())
 210 +       {
 211 +               libvlc_audio_set_volume(media_player, value);
 212 +       }
 213  }
 214
 215  double VlcEngine::get_volume()
 216  {
 217 -if (has_media())
 218 -{
 219 -int returnn=libvlc_audio_get_volume(instance,&exception);
 220 -check_exception();
 221 -return returnn;
 222 -}
 223 -else
 224 -{
 225 -return 0;
 226 -}
 227 +       return has_media() ? libvlc_audio_get_volume(media_player) : 0;
 228  }
 229 --- a/src/vlc_engine.h
 230 +++ b/src/vlc_engine.h
 231 @@ -28,11 +28,8 @@
 232  private:
 233         libvlc_instance_t*              instance;
 234         libvlc_media_player_t*  media_player;
 235 -       libvlc_exception_t              exception;
 236         libvlc_event_manager_t* event_manager;
 237
 238 -       void check_exception(const Glib::ustring& message = "");
 239 -
 240  public:
 241         VlcEngine(bool use_ffmpeg_demux = false);
 242         ~VlcEngine();