FusionSound-update.patch

   1 --- FusionSound-1.1.1/proxy/dispatcher/ifusionsound_dispatcher.c.orig   2010-11-18 08:56:24.443104966 +0100
   2 +++ FusionSound-1.1.1/proxy/dispatcher/ifusionsound_dispatcher.c        2010-11-18 09:17:35.627103290 +0100
   3 @@ -207,7 +207,7 @@ Dispatch_GetDeviceDescription( IFusionSo
   4       if (ret)
   5            return ret;
   6
   7 -     return voodoo_manager_respond( manager, msg->header.serial,
   8 +     return voodoo_manager_respond( manager, true, msg->header.serial,
   9                                      DR_OK, VOODOO_INSTANCE_NONE,
  10                                      VMBT_DATA, sizeof(FSDeviceDescription), &desc,
  11                                      VMBT_NONE );
  12 @@ -243,7 +243,7 @@ Dispatch_CreateBuffer( IFusionSound *thi
  13            return ret;
  14       }
  15
  16 -     return voodoo_manager_respond( manager, msg->header.serial,
  17 +     return voodoo_manager_respond( manager, true, msg->header.serial,
  18                                      DR_OK, instance,
  19                                      VMBT_DATA, sizeof(FSBufferDescription), &dsc,
  20                                      VMBT_NONE );
  21 @@ -279,7 +279,7 @@ Dispatch_CreateStream( IFusionSound *thi
  22            return ret;
  23       }
  24
  25 -     return voodoo_manager_respond( manager, msg->header.serial,
  26 +     return voodoo_manager_respond( manager, true, msg->header.serial,
  27                                      DR_OK, instance,
  28                                      VMBT_DATA, sizeof(FSStreamDescription), &dsc,
  29                                      VMBT_NONE );
  30 @@ -312,7 +312,7 @@ Dispatch_CreateMusicProvider( IFusionSou
  31            return ret;
  32       }
  33
  34 -     return voodoo_manager_respond( manager, msg->header.serial,
  35 +     return voodoo_manager_respond( manager, true, msg->header.serial,
  36                                      DR_OK, instance,
  37                                      VMBT_NONE );
  38  }
  39 @@ -328,7 +328,7 @@ Dispatch_GetMasterVolume( IFusionSound *
  40
  41       ret = real->GetMasterVolume( real, &level );
  42
  43 -     return voodoo_manager_respond( manager, msg->header.serial,
  44 +     return voodoo_manager_respond( manager, true, msg->header.serial,
  45                                      ret, VOODOO_INSTANCE_NONE,
  46                                      VMBT_DATA, sizeof(float), &level,
  47                                      VMBT_NONE );
  48 @@ -350,7 +350,7 @@ Dispatch_SetMasterVolume( IFusionSound *
  49
  50       ret = real->SetMasterVolume( real, level );
  51
  52 -     return voodoo_manager_respond( manager, msg->header.serial,
  53 +     return voodoo_manager_respond( manager, true, msg->header.serial,
  54                                      ret, VOODOO_INSTANCE_NONE,
  55                                      VMBT_NONE );
  56  }
  57 @@ -366,7 +366,7 @@ Dispatch_GetLocalVolume( IFusionSound *t
  58
  59       ret = real->GetLocalVolume( real, &level );
  60
  61 -     return voodoo_manager_respond( manager, msg->header.serial,
  62 +     return voodoo_manager_respond( manager, true, msg->header.serial,
  63                                      ret, VOODOO_INSTANCE_NONE,
  64                                      VMBT_DATA, sizeof(float), &level,
  65                                      VMBT_NONE );
  66 @@ -388,7 +388,7 @@ Dispatch_SetLocalVolume( IFusionSound *t
  67
  68       ret = real->SetLocalVolume( real, level );
  69
  70 -     return voodoo_manager_respond( manager, msg->header.serial,
  71 +     return voodoo_manager_respond( manager, true, msg->header.serial,
  72                                      ret, VOODOO_INSTANCE_NONE,
  73                                      VMBT_NONE );
  74  }
  75 @@ -403,7 +403,7 @@ Dispatch_Suspend( IFusionSound *thiz, IF
  76
  77       ret = real->Suspend( real );
  78
  79 -     return voodoo_manager_respond( manager, msg->header.serial,
  80 +     return voodoo_manager_respond( manager, true, msg->header.serial,
  81                                      ret, VOODOO_INSTANCE_NONE,
  82                                      VMBT_NONE );
  83  }
  84 @@ -418,7 +418,7 @@ Dispatch_Resume( IFusionSound *thiz, IFu
  85
  86       ret = real->Resume( real );
  87
  88 -     return voodoo_manager_respond( manager, msg->header.serial,
  89 +     return voodoo_manager_respond( manager, true, msg->header.serial,
  90                                      ret, VOODOO_INSTANCE_NONE,
  91                                      VMBT_NONE );
  92  }
  93 --- FusionSound-1.1.1/proxy/dispatcher/ifusionsoundbuffer_dispatcher.c.orig     2010-11-18 08:56:24.447102452 +0100
  94 +++ FusionSound-1.1.1/proxy/dispatcher/ifusionsoundbuffer_dispatcher.c  2010-11-18 09:18:49.479101613 +0100
  95 @@ -186,7 +186,7 @@ Dispatch_GetDescription( IFusionSoundBuf
  96       if (ret)
  97            return ret;
  98
  99 -     return voodoo_manager_respond( manager, msg->header.serial,
 100 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 101                                      DR_OK, VOODOO_INSTANCE_NONE,
 102                                      VMBT_DATA, sizeof(FSBufferDescription), &desc,
 103                                      VMBT_NONE );
 104 @@ -208,7 +208,7 @@ Dispatch_SetPosition( IFusionSoundBuffer
 105
 106       ret = real->SetPosition( real, position );
 107
 108 -     return voodoo_manager_respond( manager, msg->header.serial,
 109 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 110                                      ret, VOODOO_INSTANCE_NONE,
 111                                      VMBT_NONE );
 112  }
 113 @@ -250,7 +250,7 @@ Dispatch_Unlock( IFusionSoundBuffer *thi
 114
 115       real->Unlock( real );
 116
 117 -     return voodoo_manager_respond( manager, msg->header.serial,
 118 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 119                                      DR_OK, VOODOO_INSTANCE_NONE,
 120                                      VMBT_NONE );
 121  }
 122 @@ -282,7 +282,7 @@ Dispatch_Unlock_DPACK( IFusionSoundBuffe
 123
 124       real->Unlock( real );
 125
 126 -     return voodoo_manager_respond( manager, msg->header.serial,
 127 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 128                                      DR_OK, VOODOO_INSTANCE_NONE,
 129                                      VMBT_NONE );
 130  }
 131 @@ -303,7 +303,7 @@ Dispatch_Play( IFusionSoundBuffer *thiz,
 132
 133       ret = real->Play( real, flags );
 134
 135 -     return voodoo_manager_respond( manager, msg->header.serial,
 136 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 137                                      ret, VOODOO_INSTANCE_NONE,
 138                                      VMBT_NONE );
 139  }
 140 @@ -318,7 +318,7 @@ Dispatch_Stop( IFusionSoundBuffer *thiz,
 141
 142       ret = real->Stop( real );
 143
 144 -     return voodoo_manager_respond( manager, msg->header.serial,
 145 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 146                                      ret, VOODOO_INSTANCE_NONE,
 147                                      VMBT_NONE );
 148  }
 149 @@ -344,7 +344,7 @@ Dispatch_CreatePlayback( IFusionSoundBuf
 150            return ret;
 151       }
 152
 153 -     return voodoo_manager_respond( manager, msg->header.serial,
 154 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 155                                      DR_OK, instance,
 156                                      VMBT_NONE );
 157  }
 158 --- FusionSound-1.1.1/proxy/dispatcher/ifusionsoundplayback_dispatcher.c.orig   2010-11-18 08:56:24.447102452 +0100
 159 +++ FusionSound-1.1.1/proxy/dispatcher/ifusionsoundplayback_dispatcher.c        2010-11-18 09:19:48.907101613 +0100
 160 @@ -211,7 +211,7 @@ Dispatch_Start( IFusionSoundPlayback *th
 161
 162       ret = real->Start( real, start, stop );
 163
 164 -     return voodoo_manager_respond( manager, msg->header.serial,
 165 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 166                                      ret, VOODOO_INSTANCE_NONE,
 167                                      VMBT_NONE );
 168  }
 169 @@ -226,7 +226,7 @@ Dispatch_Stop( IFusionSoundPlayback *thi
 170
 171       ret = real->Stop( real );
 172
 173 -     return voodoo_manager_respond( manager, msg->header.serial,
 174 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 175                                      ret, VOODOO_INSTANCE_NONE,
 176                                      VMBT_NONE );
 177  }
 178 @@ -241,7 +241,7 @@ Dispatch_Continue( IFusionSoundPlayback
 179
 180       ret = real->Continue( real );
 181
 182 -     return voodoo_manager_respond( manager, msg->header.serial,
 183 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 184                                      ret, VOODOO_INSTANCE_NONE,
 185                                      VMBT_NONE );
 186  }
 187 @@ -256,7 +256,7 @@ Dispatch_Wait( IFusionSoundPlayback *thi
 188
 189       ret = real->Wait( real );
 190
 191 -     return voodoo_manager_respond( manager, msg->header.serial,
 192 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 193                                      ret, VOODOO_INSTANCE_NONE,
 194                                      VMBT_NONE );
 195  }
 196 @@ -275,7 +275,7 @@ Dispatch_GetStatus( IFusionSoundPlayback
 197       if (ret)
 198            return ret;
 199
 200 -     return voodoo_manager_respond( manager, msg->header.serial,
 201 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 202                                      DR_OK, VOODOO_INSTANCE_NONE,
 203                                      VMBT_INT, playing,
 204                                      VMBT_INT, position,
 205 @@ -298,7 +298,7 @@ Dispatch_SetVolume( IFusionSoundPlayback
 206
 207       ret = real->SetVolume( real, level );
 208
 209 -     return voodoo_manager_respond( manager, msg->header.serial,
 210 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 211                                      ret, VOODOO_INSTANCE_NONE,
 212                                      VMBT_NONE );
 213  }
 214 @@ -319,7 +319,7 @@ Dispatch_SetPan( IFusionSoundPlayback *t
 215
 216       ret = real->SetPan( real, value );
 217
 218 -     return voodoo_manager_respond( manager, msg->header.serial,
 219 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 220                                      ret, VOODOO_INSTANCE_NONE,
 221                                      VMBT_NONE );
 222  }
 223 @@ -340,7 +340,7 @@ Dispatch_SetPitch( IFusionSoundPlayback
 224
 225       ret = real->SetPitch( real, value );
 226
 227 -     return voodoo_manager_respond( manager, msg->header.serial,
 228 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 229                                      ret, VOODOO_INSTANCE_NONE,
 230                                      VMBT_NONE );
 231  }
 232 @@ -361,7 +361,7 @@ Dispatch_SetDirection( IFusionSoundPlayb
 233
 234       ret = real->SetDirection( real, direction );
 235
 236 -     return voodoo_manager_respond( manager, msg->header.serial,
 237 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 238                                      ret, VOODOO_INSTANCE_NONE,
 239                                      VMBT_NONE );
 240  }
 241 @@ -384,7 +384,7 @@ Dispatch_SetDownmixLevels( IFusionSoundP
 242
 243       ret = real->SetDownmixLevels( real, center, rear );
 244
 245 -     return voodoo_manager_respond( manager, msg->header.serial,
 246 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 247                                      ret, VOODOO_INSTANCE_NONE,
 248                                      VMBT_NONE );
 249  }
 250 --- FusionSound-1.1.1/proxy/dispatcher/ifusionsoundstream_dispatcher.c.orig     2010-11-18 08:56:24.475097423 +0100
 251 +++ FusionSound-1.1.1/proxy/dispatcher/ifusionsoundstream_dispatcher.c  2010-11-18 09:20:43.463101613 +0100
 252 @@ -216,7 +216,7 @@ Dispatch_GetDescription( IFusionSoundStr
 253       if (ret)
 254            return ret;
 255
 256 -     return voodoo_manager_respond( manager, msg->header.serial,
 257 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 258                                      DR_OK, VOODOO_INSTANCE_NONE,
 259                                      VMBT_DATA, sizeof(FSStreamDescription), &desc,
 260                                      VMBT_NONE );
 261 @@ -240,7 +240,7 @@ Dispatch_Write( IFusionSoundStream *thiz
 262
 263       ret = real->Write( real, samples, length );
 264
 265 -     return voodoo_manager_respond( manager, msg->header.serial,
 266 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 267                                      ret, VOODOO_INSTANCE_NONE,
 268                                      VMBT_NONE );
 269  }
 270 @@ -268,7 +268,7 @@ Dispatch_Write_DPACK( IFusionSoundStream
 271
 272       ret = real->Write( real, samples, length );
 273
 274 -     return voodoo_manager_respond( manager, msg->header.serial,
 275 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 276                                      ret, VOODOO_INSTANCE_NONE,
 277                                      VMBT_NONE );
 278  }
 279 @@ -289,7 +289,7 @@ Dispatch_Wait( IFusionSoundStream *thiz,
 280
 281       ret = real->Wait( real, length );
 282
 283 -     return voodoo_manager_respond( manager, msg->header.serial,
 284 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 285                                      ret, VOODOO_INSTANCE_NONE,
 286                                      VMBT_NONE );
 287  }
 288 @@ -309,7 +309,7 @@ Dispatch_GetStatus( IFusionSoundStream *
 289
 290       ret = real->GetStatus( real, &filled, &total, &read_pos, &write_pos, &playing );
 291
 292 -     return voodoo_manager_respond( manager, msg->header.serial,
 293 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 294                                      ret, VOODOO_INSTANCE_NONE,
 295                                      VMBT_INT, filled,
 296                                      VMBT_INT, total,
 297 @@ -329,7 +329,7 @@ Dispatch_Flush( IFusionSoundStream *thiz
 298
 299       ret = real->Flush( real );
 300
 301 -     return voodoo_manager_respond( manager, msg->header.serial,
 302 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 303                                      ret, VOODOO_INSTANCE_NONE,
 304                                      VMBT_NONE );
 305  }
 306 @@ -344,7 +344,7 @@ Dispatch_Drop( IFusionSoundStream *thiz,
 307
 308       ret = real->Drop( real );
 309
 310 -     return voodoo_manager_respond( manager, msg->header.serial,
 311 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 312                                      ret, VOODOO_INSTANCE_NONE,
 313                                      VMBT_NONE );
 314  }
 315 @@ -360,7 +360,7 @@ Dispatch_GetPresentationDelay( IFusionSo
 316
 317       ret = real->GetPresentationDelay( real, &delay );
 318
 319 -     return voodoo_manager_respond( manager, msg->header.serial,
 320 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 321                                      ret, VOODOO_INSTANCE_NONE,
 322                                      VMBT_INT, delay,
 323                                      VMBT_NONE );
 324 @@ -387,7 +387,7 @@ Dispatch_GetPlayback( IFusionSoundStream
 325            return ret;
 326       }
 327
 328 -     return voodoo_manager_respond( manager, msg->header.serial,
 329 +     return voodoo_manager_respond( manager, true, msg->header.serial,
 330                                      DR_OK, instance,
 331                                      VMBT_NONE );
 332  }
 333 --- FusionSound-1.1.1/tools/fsproxy.c.orig      2010-11-18 08:56:24.839107480 +0100
 334 +++ FusionSound-1.1.1/tools/fsproxy.c   2010-11-18 09:30:10.919102452 +0100
 335 @@ -162,7 +162,7 @@ server_run()
 336       DirectResult  ret;
 337       VoodooServer *server;
 338
 339 -     ret = voodoo_server_create( &server );
 340 +     ret = voodoo_server_create( NULL, 0, false, &server );
 341       if (ret) {
 342            D_ERROR( "Voodoo/Proxy: Could not create the server (%s)!\n", FusionSoundErrorString(ret) );
 343            return ret;