[Hamlib-cvs-digest] CVS: hamlib/gnuradio demod.h,1.2,1.3 gnuradio.cc,1.8,1.9

[St?phane F. <fi...@us...>]

Update of /cvsroot/hamlib/hamlib/gnuradio
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1381/gnuradio

Modified Files:
	demod.h gnuradio.cc 
Log Message:
Prefixed misc str* and parse_* calls with rig_ to export them in rig.h


Index: demod.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/gnuradio/demod.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** demod.h	8 Feb 2004 20:27:58 -0000	1.2
--- demod.h	17 May 2004 21:09:43 -0000	1.3
***************
*** 1,5 ****
  /*
   *  Hamlib GNUradio backend - Demodulator chain class
!  *  Copyright (c) 2003 by Stephane Fillod
   *
   *	$Id$
--- 1,5 ----
  /*
   *  Hamlib GNUradio backend - Demodulator chain class
!  *  Copyright (c) 2003-2004 by Stephane Fillod
   *
   *	$Id$
***************
*** 49,53 ****
  	virtual ~DemodChainCF () { delete agc; delete mixer; delete gainstage; delete audio_filter; }
  
! 	virtual const char *name() { return strrmode(mode); }
  
  	virtual void connect (void);
--- 49,53 ----
  	virtual ~DemodChainCF () { delete agc; delete mixer; delete gainstage; delete audio_filter; }
  
! 	virtual const char *name() { return rig_strrmode(mode); }
  
  	virtual void connect (void);

Index: gnuradio.cc
===================================================================
RCS file: /cvsroot/hamlib/hamlib/gnuradio/gnuradio.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** gnuradio.cc	8 Feb 2004 20:27:58 -0000	1.8
--- gnuradio.cc	17 May 2004 21:09:43 -0000	1.9
***************
*** 2,6 ****
  /*
   *  Hamlib GNUradio backend - main file
!  *  Copyright (c) 2001-2003 by Stephane Fillod
   *
   *	$Id$
--- 2,6 ----
  /*
   *  Hamlib GNUradio backend - main file
!  *  Copyright (c) 2001-2004 by Stephane Fillod
   *
   *	$Id$
***************
*** 99,103 ****
    chan->channel_num = 0;
    chan->vfo = vfo;
!   strcpy(chan->channel_desc, strvfo(vfo));
  
    chan->freq = RIG_FREQ_NONE;
--- 99,103 ----
    chan->channel_num = 0;
    chan->vfo = vfo;
!   strcpy(chan->channel_desc, rig_strvfo(vfo));
  
    chan->freq = RIG_FREQ_NONE;
***************
*** 502,506 ****
    sprintf_freq(fstr, freq);
    rig_debug(RIG_DEBUG_TRACE,"%s called: %s %s\n", 
!  			__FUNCTION__, strvfo(vfo), fstr);
  
    ret = rig_get_freq(priv->tuner, RIG_VFO_CURR, &tuner_freq);
--- 502,506 ----
    sprintf_freq(fstr, freq);
    rig_debug(RIG_DEBUG_TRACE,"%s called: %s %s\n", 
!  			__FUNCTION__, rig_strvfo(vfo), fstr);
  
    ret = rig_get_freq(priv->tuner, RIG_VFO_CURR, &tuner_freq);
***************
*** 556,560 ****
    channel_t *chan = &priv->chans[chan_num];
  
!   rig_debug(RIG_DEBUG_VERBOSE,"%s called: %s\n", __FUNCTION__, strvfo(vfo));
  
    *freq = chan->freq;
--- 556,560 ----
    channel_t *chan = &priv->chans[chan_num];
  
!   rig_debug(RIG_DEBUG_VERBOSE,"%s called: %s\n", __FUNCTION__, rig_strvfo(vfo));
  
    *freq = chan->freq;
***************
*** 582,586 ****
    sprintf_freq(buf, width);
    rig_debug(RIG_DEBUG_VERBOSE,"%s called: %s %s %s\n", 
!   		__FUNCTION__, strvfo(vfo), strrmode(mode), buf);
  
    if (mode == chan->mode && width == chan->width)
--- 582,586 ----
    sprintf_freq(buf, width);
    rig_debug(RIG_DEBUG_VERBOSE,"%s called: %s %s %s\n", 
!   		__FUNCTION__, rig_strvfo(vfo), rig_strrmode(mode), buf);
  
    if (mode == chan->mode && width == chan->width)
***************
*** 682,686 ****
    channel_t *chan = &priv->chans[chan_num];
  
!   rig_debug(RIG_DEBUG_VERBOSE,"%s called: %s\n", __FUNCTION__, strvfo(vfo));
  
    *mode = chan->mode;
--- 682,686 ----
    channel_t *chan = &priv->chans[chan_num];
  
!   rig_debug(RIG_DEBUG_VERBOSE,"%s called: %s\n", __FUNCTION__, rig_strvfo(vfo));
  
    *mode = chan->mode;
***************
*** 702,706 ****
  
    priv->curr_vfo = vfo;
!   rig_debug(RIG_DEBUG_VERBOSE,"%s called: %s\n", __FUNCTION__, strvfo(vfo));
  
    return RIG_OK;
--- 702,706 ----
  
    priv->curr_vfo = vfo;
!   rig_debug(RIG_DEBUG_VERBOSE,"%s called: %s\n", __FUNCTION__, rig_strvfo(vfo));
  
    return RIG_OK;
***************
*** 713,717 ****
  
    *vfo = priv->curr_vfo;
!   rig_debug(RIG_DEBUG_VERBOSE,"%s called: %s\n", __FUNCTION__, strvfo(*vfo));
  
    return RIG_OK;
--- 713,717 ----
  
    *vfo = priv->curr_vfo;
!   rig_debug(RIG_DEBUG_VERBOSE,"%s called: %s\n", __FUNCTION__, rig_strvfo(*vfo));
  
    return RIG_OK;
***************
*** 739,743 ****
  	  sprintf(lstr, "%d", val.i);
    rig_debug(RIG_DEBUG_VERBOSE,"%s called: %s %s\n",__FUNCTION__, 
! 				  strlevel(level), lstr);
    /* TODO: check val is in range */
  
--- 739,743 ----
  	  sprintf(lstr, "%d", val.i);
    rig_debug(RIG_DEBUG_VERBOSE,"%s called: %s %s\n",__FUNCTION__, 
! 				  rig_strlevel(level), lstr);
    /* TODO: check val is in range */
  
***************
*** 750,754 ****
    default:
  	rig_debug(RIG_DEBUG_TRACE, "%s: level %s, try tuner\n",
! 			  __FUNCTION__, strlevel(level));
  	ret = rig_set_level(priv->tuner, vfo, level, val);
  	break;
--- 750,754 ----
    default:
  	rig_debug(RIG_DEBUG_TRACE, "%s: level %s, try tuner\n",
! 			  __FUNCTION__, rig_strlevel(level));
  	ret = rig_set_level(priv->tuner, vfo, level, val);
  	break;
***************
*** 773,777 ****
    	*val = chan->levels[idx];
    rig_debug(RIG_DEBUG_VERBOSE,"%s called: %s\n",__FUNCTION__, 
! 				  strlevel(level));
  
    return RIG_OK;
--- 773,777 ----
    	*val = chan->levels[idx];
    rig_debug(RIG_DEBUG_VERBOSE,"%s called: %s\n",__FUNCTION__, 
! 				  rig_strlevel(level));
  
    return RIG_OK;
***************
*** 845,849 ****
  
    rig_debug(RIG_DEBUG_VERBOSE,"%s called: %s\n",__FUNCTION__, 
! 				  strvfop(op));
  
    switch (op) {
--- 845,849 ----
  
    rig_debug(RIG_DEBUG_VERBOSE,"%s called: %s\n",__FUNCTION__, 
! 				  rig_strvfop(op));
  
    switch (op) {