package/audio/xmp/hotfix.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../xmp/compile.patch
   5 # Copyright (C) 2004 - 2005 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16 diff -urN xmp-2.0.4.orig/src/loaders/it_load.c xmp-2.0.4/src/loaders/it_load.c
  17 --- xmp-2.0.4.orig/src/loaders/it_load.c        2005-03-29 20:16:41.008201432 +0200
  18 +++ xmp-2.0.4/src/loaders/it_load.c     2005-03-29 20:18:19.885169848 +0200
  19 @@ -327,14 +327,14 @@
  20
  21  #define BUILD_ENV(X) { \
  22             fread (&env, 1, sizeof (env), f); \
  23 -           xxih[i].##X##ei.flg = env.flg & IT_ENV_ON ? XXM_ENV_ON : 0; \
  24 -           xxih[i].##X##ei.flg |= env.flg & IT_ENV_LOOP ? XXM_ENV_LOOP : 0; \
  25 -           xxih[i].##X##ei.flg |= env.flg & IT_ENV_SLOOP ? XXM_ENV_SUS : 0; \
  26 -           xxih[i].##X##ei.npt = env.num; \
  27 -           xxih[i].##X##ei.sus = env.slb; \
  28 -           xxih[i].##X##ei.sue = env.sle; \
  29 -           xxih[i].##X##ei.lps = env.lpb; \
  30 -           xxih[i].##X##ei.lpe = env.lpe; \
  31 +           xxih[i]. X##ei.flg = env.flg & IT_ENV_ON ? XXM_ENV_ON : 0; \
  32 +           xxih[i]. X##ei.flg |= env.flg & IT_ENV_LOOP ? XXM_ENV_LOOP : 0; \
  33 +           xxih[i]. X##ei.flg |= env.flg & IT_ENV_SLOOP ? XXM_ENV_SUS : 0; \
  34 +           xxih[i]. X##ei.npt = env.num; \
  35 +           xxih[i]. X##ei.sus = env.slb; \
  36 +           xxih[i]. X##ei.sue = env.sle; \
  37 +           xxih[i]. X##ei.lps = env.lpb; \
  38 +           xxih[i]. X##ei.lpe = env.lpe; \
  39             if (env.num) xx##X##e[i] = calloc (4, env.num); \
  40             for (j = 0; j < env.num; j++) { \
  41                 L_ENDIAN16 (env.node[j].x); \
  42 diff -urN xmp-2.0.4.orig/src/xmms/plugin.c xmp-2.0.4/src/xmms/plugin.c
  43 --- xmp-2.0.4.orig/src/xmms/plugin.c    2005-03-29 20:16:40.999202800 +0200
  44 +++ xmp-2.0.4/src/xmms/plugin.c 2005-03-29 20:19:24.391363416 +0200
  45 @@ -228,7 +228,7 @@
  46         xmp_cfg.filter = TRUE;
  47         xmp_cfg.pan_amplitude = 80;
  48
  49 -#define CFGREADINT(x) xmms_cfg_read_int (cfg, "XMP", #x, &xmp_cfg.##x)
  50 +#define CFGREADINT(x) xmms_cfg_read_int (cfg, "XMP", #x, &xmp_cfg. x)
  51
  52         filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL);
  53         if ((cfg = xmms_cfg_open_file(filename))) {
  54 @@ -558,7 +558,7 @@
  55         gtk_object_set_data(GTK_OBJECT(xmp_conf_window), #w, w);        \
  56         gtk_widget_show(w);                                             \
  57         gtk_box_pack_start(GTK_BOX(vbox6), w, TRUE, TRUE, 0);           \
  58 -       if (xmp_cfg.##o == 1)                                           \
  59 +       if (xmp_cfg. o == 1)                                            \
  60                 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE); \
  61  }
  62
  63 @@ -658,7 +658,7 @@
  64         if (!cfg)
  65                 cfg = xmms_cfg_new();
  66
  67 -#define CFGWRITEINT(x) xmms_cfg_write_int (cfg, "XMP", #x, xmp_cfg.##x)
  68 +#define CFGWRITEINT(x) xmms_cfg_write_int (cfg, "XMP", #x, xmp_cfg. x)
  69
  70         CFGWRITEINT (mixing_freq);
  71         CFGWRITEINT (force8bit);