[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-multimedia
Subject:    Re: kmidi, kmix don't comiple against alsa 0.9
From:       Scott Wheeler <wheeler () kde ! org>
Date:       2002-05-29 12:22:10
[Download RAW message or body]

*groan*

Ok, downloaded from your KDE mirror of choice, or SuSE's FTP site, I present 
the SuSE kdemultimedia patch for KDE 3.0.1.

-Scott

On Wednesday 29 May 2002 02:06 pm, Joerg Anders wrote:
> On Wed, 29 May 2002, Fabian Wolf wrote:
> 
> >
> > A simple diff will do it ;)
> >
> 
> Again: I don't have the source CD. (it is CD 7 of the SuSE distribution).
> 

["kdemultimedia.dif" (text/x-diff)]

--- kmidi/alsa_a.cpp
+++ kmidi/alsa_a.cpp	2001/12/09 16:08:58
@@ -48,11 +48,11 @@
 #ifdef __cplusplus
 #undef __cplusplus
 extern "C" {
-#include <sys/asoundlib.h>
+#include <alsa/asoundlib.h>
 }
 #define __cplusplus
 #else
-#include <sys/asoundlib.h>
+#include <alsa/asoundlib.h>
 #endif
 
 #ifdef ORIG_TIMPP
@@ -284,7 +284,7 @@
   memset(&playback_info, 0, sizeof(playback_info));
   playback_info.channel = SND_PCM_CHANNEL_PLAYBACK;
 
-  tmp = snd_pcm_plugin_info (handle__, &playback_info);
+  tmp = snd_pcm_plugin_info ((snd_pcm_t *)handle__, &playback_info);
 //fprintf(stderr,"tmp = %d from snd_pcm_channel_info\n",tmp);
   if (tmp != 0)
     {
@@ -373,7 +373,7 @@
   memcpy(&playback_params.format, &pcm_format, sizeof(pcm_format));
 
 #if 0
-  tmp = snd_pcm_channel_format (handle__, &pcm_format);
+  tmp = snd_pcm_channel_format ((snd_pcm_t *)handle__, &pcm_format);
   if (tmp != 0)
     {
       error_report (tmp);
@@ -426,13 +426,13 @@
     playback_params.fragments_max = extra_param[0];
 #endif
   playback_params.buf.block.frags_min = 1;
-  snd_pcm_plugin_flush(handle__, SND_PCM_CHANNEL_PLAYBACK);
+  snd_pcm_plugin_flush((snd_pcm_t *)handle__, SND_PCM_CHANNEL_PLAYBACK);
 
   playback_params.start_mode = SND_PCM_START_FULL;
   playback_params.stop_mode = SND_PCM_STOP_STOP;
   //playback_params.stop_mode = SND_PCM_STOP_ROLLOVER;
 
-  tmp = snd_pcm_channel_params (handle__, &playback_params);
+  tmp = snd_pcm_channel_params ((snd_pcm_t *)handle__, &playback_params);
 
 //fprintf(stderr,"tmp = %d from snd_pcm_channel_params\n",tmp);
   if (tmp != 0)
@@ -448,7 +448,7 @@
     }
 
 
-  if (snd_pcm_plugin_prepare(handle__, SND_PCM_CHANNEL_PLAYBACK) < 0) {
+  if (snd_pcm_plugin_prepare((snd_pcm_t *)handle__, SND_PCM_CHANNEL_PLAYBACK) < 0) {
       fprintf(stderr, "unable to prepare channel\n");
       return -1;
   } 
@@ -456,7 +456,7 @@
   memset(&setup, 0, sizeof(setup));
   setup.channel = SND_PCM_CHANNEL_PLAYBACK;
   setup.mode = SND_PCM_MODE_BLOCK;
-  if (snd_pcm_plugin_setup(handle__, &setup) < 0) {
+  if (snd_pcm_plugin_setup((snd_pcm_t *)handle__, &setup) < 0) {
       fprintf(stderr, "unable to obtain setup\n");
       return -1;
   }
@@ -466,7 +466,7 @@
 //fprintf(stderr, "setup frags = %d\n", setup.buf.block.frags);
 //fprintf(stderr, "setup frag_size = %d\n", setup.buf.block.frag_size);
 
-  if(snd_pcm_plugin_status(handle__, &playback_status) == 0)
+  if(snd_pcm_plugin_status((snd_pcm_t *)handle__, &playback_status) == 0)
     {
       if (setup.format.rate != orig_rate)
 	{
--- kmidi/config/timidity.cfg
+++ kmidi/config/timidity.cfg	2001/12/09 16:08:58
@@ -28,7 +28,7 @@
 # If you've moved things around since compiling, uncomment and edit this to
 # point to the library directory: 
 #
-#dir /opt/kde/share/apps/kmidi/config
+dir /opt/kde2/share/apps/kmidi/config
 #
 
 ##############################################################################
--- kmidi/config/tkmidity.ptcl
+++ kmidi/config/tkmidity.ptcl	2001/12/09 16:08:58
@@ -1,4 +1,4 @@
-#!/usr/local/bin/wishx -f
+#!/usr/bin/wishx -f
 #
 # TkMidity -- Tcl/Tk Interface for TiMidity
 #	written by Takashi IWAI
--- kmidi/config/tkpanel.tcl
+++ kmidi/config/tkpanel.tcl	2001/12/09 16:08:58
@@ -1,4 +1,4 @@
-#!/usr/local/bin/wishx -f
+#!/usr/bin/wishx -f
 #
 # TkMidity -- Tcl/Tk Interface for TiMidity
 #	written by Takashi IWAI
--- kscd/cddaslave.c
+++ kscd/cddaslave.c	2001/12/09 16:08:58
@@ -29,6 +29,10 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
+#ifndef timerclear
+#define timerclear(tvp) ((tvp)->tv_sec = (tvp)->tv_usec = 0)
+#endif
+
 int	playing = 0;		/* Should the CD be playing now? */
 
 /*

_______________________________________________
kde-multimedia mailing list
kde-multimedia@mail.kde.org
http://mail.kde.org/mailman/listinfo/kde-multimedia

[prev in list] [next in list] [prev in thread] [next in thread]