[Deinterlace-checkins] CVS: DScaler/DScaler BT848Source.cpp,1.136,1.137 CX2388xSource.cpp,1.74,1.75 EPG.cpp,1.28,1.29 SAA7134Source.cpp,1.98,1.99

[Laurent G. <lau...@us...>]

Update of /cvsroot/deinterlace/DScaler/DScaler
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29600

Modified Files:
	BT848Source.cpp CX2388xSource.cpp EPG.cpp SAA7134Source.cpp 
Log Message:
Use the new function Channel_GetVBIName

Index: BT848Source.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/DScaler/BT848Source.cpp,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -r1.136 -r1.137
*** BT848Source.cpp	29 Mar 2005 13:06:59 -0000	1.136
--- BT848Source.cpp	26 Jul 2005 22:19:13 -0000	1.137
***************
*** 19,22 ****
--- 19,25 ----
  //
  // $Log$
+ // Revision 1.137  2005/07/26 22:19:13  laurentg
+ // Use the new function Channel_GetVBIName
+ //
  // Revision 1.136  2005/03/29 13:06:59  adcockj
  // Avoid tight loops in processing
***************
*** 1201,1223 ****
  LPCSTR CBT848Source::GetStatus()
  {
-     static char szStatus[24];
      LPCSTR pRetVal;
  
      if (IsInTunerMode())
      {
!         VT_GetStation(szStatus, sizeof(szStatus));
  
!         if (*szStatus == '\0')
!         {
!             VPS_GetChannelName(szStatus, sizeof(szStatus));
!         }
!         if (*szStatus == '\0')
          {
              pRetVal = Channel_GetName();
          }
-         else
-         {
-             pRetVal = szStatus;
-         }
      }
      else
--- 1204,1217 ----
  LPCSTR CBT848Source::GetStatus()
  {
      LPCSTR pRetVal;
  
      if (IsInTunerMode())
      {
!         pRetVal = Channel_GetVBIName();
  
!         if (*pRetVal == '\0')
          {
              pRetVal = Channel_GetName();
          }
      }
      else

Index: CX2388xSource.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/DScaler/CX2388xSource.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -r1.74 -r1.75
*** CX2388xSource.cpp	29 Mar 2005 13:07:00 -0000	1.74
--- CX2388xSource.cpp	26 Jul 2005 22:19:31 -0000	1.75
***************
*** 24,27 ****
--- 24,30 ----
  //
  // $Log$
+ // Revision 1.75  2005/07/26 22:19:31  laurentg
+ // Use the new function Channel_GetVBIName
+ //
  // Revision 1.74  2005/03/29 13:07:00  adcockj
  // Avoid tight loops in processing
***************
*** 1144,1166 ****
  LPCSTR CCX2388xSource::GetStatus()
  {
-     static char szStatus[24];
      static LPCSTR pRetVal = "";
  
      if (IsInTunerMode())
      {
!         VT_GetStation(szStatus, sizeof(szStatus));
  
!         if (*szStatus == '\0')
!         {
!             VPS_GetChannelName(szStatus, sizeof(szStatus));
!         }
!         if (*szStatus == '\0')
          {
              pRetVal = Channel_GetName();
          }
-         else
-         {
-             pRetVal = szStatus;
-         }
      }
      else
--- 1147,1160 ----
  LPCSTR CCX2388xSource::GetStatus()
  {
      static LPCSTR pRetVal = "";
  
      if (IsInTunerMode())
      {
!         pRetVal = Channel_GetVBIName();
  
!         if (*pRetVal == '\0')
          {
              pRetVal = Channel_GetName();
          }
      }
      else

Index: EPG.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/DScaler/EPG.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** EPG.cpp	23 Jul 2005 19:13:27 -0000	1.28
--- EPG.cpp	26 Jul 2005 22:19:31 -0000	1.29
***************
*** 19,22 ****
--- 19,25 ----
  //
  // $Log$
+ // Revision 1.29  2005/07/26 22:19:31  laurentg
+ // Use the new function Channel_GetVBIName
+ //
  // Revision 1.28  2005/07/23 19:13:27  laurentg
  // EPG: put common code in a new function
***************
*** 1116,1132 ****
  		else if (Setting_GetValue(VBI_GetSetting(CAPTURE_VBI)))
  		{
! 			char szStatus[24];
! 			szStatus[0] = '\0';
! 			if (Setting_GetValue(VBI_GetSetting(DOTELETEXT)))
! 			{
! 				VT_GetStation(szStatus, sizeof(szStatus));
! 			}
! 			if ( (*szStatus == '\0') && Setting_GetValue(VBI_GetSetting(DOVPS)) )
! 			{
! 				VPS_GetChannelName(szStatus, sizeof(szStatus));
! 			}
! 			if (szStatus[0] != '\0')
  			{
! 				Channel = szStatus;
  			}
  		}
--- 1119,1126 ----
  		else if (Setting_GetValue(VBI_GetSetting(CAPTURE_VBI)))
  		{
! 			LPCSTR pChannel = Channel_GetVBIName();
! 			if (*pChannel != '\0')
  			{
! 				Channel = pChannel;
  			}
  		}

Index: SAA7134Source.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/DScaler/SAA7134Source.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -r1.98 -r1.99
*** SAA7134Source.cpp	18 May 2005 12:18:32 -0000	1.98
--- SAA7134Source.cpp	26 Jul 2005 22:19:31 -0000	1.99
***************
*** 31,34 ****
--- 31,37 ----
  //
  // $Log$
+ // Revision 1.99  2005/07/26 22:19:31  laurentg
+ // Use the new function Channel_GetVBIName
+ //
  // Revision 1.98  2005/05/18 12:18:32  robmuller
  // Added gamma control.
***************
*** 1436,1458 ****
  LPCSTR CSAA7134Source::GetStatus()
  {
-     static char szStatus[24];
      LPCSTR pRetVal;
  
      if (IsInTunerMode())
      {
!         VT_GetStation(szStatus, sizeof(szStatus));
  
!         if (*szStatus == '\0')
!         {
!             VPS_GetChannelName(szStatus, sizeof(szStatus));
!         }
!         if (*szStatus == '\0')
          {
              pRetVal = Channel_GetName();
          }
-         else
-         {
-             pRetVal = szStatus;
-         }
      }
      else
--- 1439,1452 ----
  LPCSTR CSAA7134Source::GetStatus()
  {
      LPCSTR pRetVal;
  
      if (IsInTunerMode())
      {
!         pRetVal = Channel_GetVBIName();
  
!         if (*pRetVal == '\0')
          {
              pRetVal = Channel_GetName();
          }
      }
      else