← Back to branch summary

~ubuntu-branches/ubuntu/raring/gst-plugins-good0.10/raring-proposed

« back to all changes in this revision

Viewing changes to sys/waveform/gstwaveformsink.c

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2012-02-09 16:44:53 UTC
  • mfrom: (40.2.38 experimental)
  • Revision ID: package-import@ubuntu.com-20120209164453-6hjokwrvdn42zopb
Tags: 0.10.30.3-1ubuntu1
* Merge from Debian experimental, remaining changes:
  - 04_move_farsight_plugins_to_good.patch
    Import autoconvert, dtmf, liveadder, rptmux from -plugins-bad
  - 05_move_shm_to_good.patch
    Import shm from -plugins-bad.
  - 07_move-camerabin.patch
    Import camerabin, camerabin2, jpegformat and basecamerabinsrc
    from -plugins-bad.
  - control*:
    * Drop dependency from gstreamer0.10-plugins-good on
      gstreamer0.10-gconf. It pulls gconf and gtk3 onto the Kubuntu cd.
    * Use Breaks instead of Conflicts.
    * Add a 'Pre-Depends: ${misc:Pre-Depends}' to the plugin package,
      since we're shipping shared libraries in the package that Debian
      isn't.
* Update the patches by pulling new version of the code from
  -plugins-bad 0.10.22.3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sys/waveform/gstwaveformsink.c
80
80
    gint bits_per_sample);
81
81
WAVEHDR *bufferpool_get_buffer (GstWaveFormSink * wfsink, gpointer data,
82
82
    guint length);
83
 
void CALLBACK waveOutProc (HWAVEOUT hwo, UINT uMsg, unsigned long dwInstance,
84
 
    DWORD dwParam1, DWORD dwParam2);
 
83
void CALLBACK waveOutProc (HWAVEOUT hwo, UINT uMsg, DWORD_PTR dwInstance,
 
84
    DWORD_PTR dwParam1, DWORD_PTR dwParam2);
85
85
 
86
86
static GstStaticPadTemplate waveformsink_sink_factory =
87
87
    GST_STATIC_PAD_TEMPLATE ("sink",
378
378
 
379
379
  /* open the default audio device with the given caps */
380
380
  mmresult = waveOutOpen (&wfsink->hwaveout, WAVE_MAPPER,
381
 
      &wfx, (DWORD) waveOutProc, (DWORD) wfsink, CALLBACK_FUNCTION);
 
381
      &wfx, (DWORD_PTR) waveOutProc, (DWORD_PTR) wfsink, CALLBACK_FUNCTION);
382
382
  if (mmresult != MMSYSERR_NOERROR) {
383
383
    waveOutGetErrorText (mmresult, wfsink->error_string, ERROR_LENGTH - 1);
384
384
    GST_ELEMENT_ERROR (wfsink, RESOURCE, OPEN_WRITE,
573
573
 
574
574
void CALLBACK
575
575
waveOutProc (HWAVEOUT hwo,
576
 
    UINT uMsg, unsigned long dwInstance, DWORD dwParam1, DWORD dwParam2)
 
576
    UINT uMsg, DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2)
577
577
{
578
578
  GstWaveFormSink *wfsink = (GstWaveFormSink *) dwInstance;
579
579