[Bdadev-cvs] CleverTelly CleverTelly.dsp,1.4,1.5 CleverTelly.rc,1.4,1.5 MainDlg.cpp,1.6,1.7 MainDlg.h,1.5,1.6 MSVidCtlComp.cpp,1.4,NONE MSVidCtlComp.h,1.3,NONE MSVidCtlComp.rgs,1.1.1.1,NONE cleverte.ico,1.1,NONE msvidctl.bmp,1.1.1.1,NONE

[<ad...@us...>]

Update of /cvsroot/bdadev/CleverTelly
In directory sc8-pr-cvs1:/tmp/cvs-serv4050

Modified Files:
	CleverTelly.dsp CleverTelly.rc MainDlg.cpp MainDlg.h 
Removed Files:
	MSVidCtlComp.cpp MSVidCtlComp.h MSVidCtlComp.rgs cleverte.ico 
	msvidctl.bmp 
Log Message:
Bug fixes and tidy up


Index: CleverTelly.dsp
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/CleverTelly.dsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CleverTelly.dsp	25 Feb 2003 17:19:04 -0000	1.4
--- CleverTelly.dsp	26 Feb 2003 17:13:44 -0000	1.5
***************
*** 70,74 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
! # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "STRICT" /Yu"stdafx.h" /FD /GZ /c
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
--- 70,74 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
! # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "STRICT" /FR /Yu"stdafx.h" /FD /GZ /c
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

Index: CleverTelly.rc
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/CleverTelly.rc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CleverTelly.rc	25 Feb 2003 17:19:04 -0000	1.4
--- CleverTelly.rc	26 Feb 2003 17:13:44 -0000	1.5
***************
*** 69,82 ****
  //
  
! IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 187, 102
  STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "About"
  FONT 8, "MS Sans Serif"
  BEGIN
!     DEFPUSHBUTTON   "OK",IDOK,130,81,50,14
!     CTEXT           "CleverTelly Application v1.0\n\n(c) Copyright 2003",
!                     IDC_STATIC,25,57,78,32
!     ICON            IDR_MAINFRAME,IDC_STATIC,55,26,18,20
!     GROUPBOX        "",IDC_STATIC,7,7,115,88
  END
  
--- 69,86 ----
  //
  
! IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 326, 157
  STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "About"
  FONT 8, "MS Sans Serif"
  BEGIN
!     CTEXT           "CleverTelly Applcation v1.0\n(c) Copyright John Adcock 2003",
!                     IDC_STATIC,103,20,118,18
!     ICON            IDR_MAINFRAME,IDC_STATIC,22,18,21,20
!     DEFPUSHBUTTON   "OK",IDOK,138,136,50,14
!     GROUPBOX        "Licence Info",IDC_STATIC,13,47,306,84
!     LTEXT           "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.",
!                     IDC_STATIC,16,57,296,31
!     LTEXT           "This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.",
!                     IDC_STATIC,14,89,299,33
  END
  
***************
*** 119,125 ****
      BEGIN
          LEFTMARGIN, 7
!         RIGHTMARGIN, 180
          TOPMARGIN, 7
!         BOTTOMMARGIN, 95
      END
  END
--- 123,129 ----
      BEGIN
          LEFTMARGIN, 7
!         RIGHTMARGIN, 319
          TOPMARGIN, 7
!         BOTTOMMARGIN, 150
      END
  END

Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/MainDlg.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MainDlg.cpp	26 Feb 2003 08:17:55 -0000	1.6
--- MainDlg.cpp	26 Feb 2003 17:13:52 -0000	1.7
***************
*** 123,126 ****
--- 123,128 ----
      CHECK(m_pVidControl->put_BackColor(Black));
      CHECK(m_pVidControl->put_ColorKey(Black));
+     CHECK(m_pVidControl->put_AutoSize(VARIANT_FALSE));
+     CHECK(m_pVidControl->put_MaintainAspectRatio(VARIANT_FALSE));
  
      // create the Tune Request store
***************
*** 275,279 ****
          break;
      case SIZE_MINIMIZED:
!         CloseWindow(m_hWnd);
          break;
      case SIZE_RESTORED:
--- 277,281 ----
          break;
      case SIZE_MINIMIZED:
!         ShowWindow(SW_HIDE);
          break;
      case SIZE_RESTORED:
***************
*** 282,286 ****
          break;
      default:
-         ResizeVideoControl();
          break;
      }
--- 284,287 ----
***************
*** 289,301 ****
  }
  
! void __stdcall CMainDlg::OnClick()
  {
!     ATLTRACE("OnClick\n");
      TuneToChannel(8);
      m_pVidControl->Run();
  }
  
! void __stdcall CMainDlg::OnStateChange(MSVidCtlStateList PrevState, MSVidCtlStateList CurrState)
  {
      if(CurrState == STATE_PLAY)
      {
--- 290,303 ----
  }
  
! void __stdcall CMainDlg::OnVidCtlClick()
  {
!     ATLTRACE("OnVidCtlClick\n");
      TuneToChannel(8);
      m_pVidControl->Run();
  }
  
! void __stdcall CMainDlg::OnVidCtlStateChange(MSVidCtlStateList PrevState, MSVidCtlStateList CurrState)
  {
+     ATLTRACE("OnVidCtlStateChange Old %d New %d\n", PrevState, CurrState);
      if(CurrState == STATE_PLAY)
      {
***************
*** 310,347 ****
  }
  
! void __stdcall CMainDlg::OnDblClick()
  {
!     ATLTRACE("OnDblClick\n");
  }
  
! void __stdcall CMainDlg::OnError(short Number, BSTR* pDescription, long Scode, BSTR Source, BSTR HelpFile, long HelpContext, boolean* pCancelDisplay)
  {
!     ATLTRACE("OnError %04x\n", Number);
  }
  
! void __stdcall CMainDlg::OnKeyDown(short* pKeyCode, short Shift)
  {
!     ATLTRACE("OnKeyDown %04x\n", *pKeyCode);
  }
  
! void __stdcall CMainDlg::OnKeyPress(short* pKeyCode)
  {
!     ATLTRACE("OnKeyPress %04x\n", *pKeyCode);
  }
  
! void __stdcall CMainDlg::OnKeyUp(short* pKeyCode, short Shift)
  {
!     ATLTRACE("OnKeyUp %04x\n", *pKeyCode);
  }
  
! void __stdcall CMainDlg::OnMouseDown(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y)
  {
  }
  
! void __stdcall CMainDlg::OnMouseMove(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y)
  {
  }
  
! void __stdcall CMainDlg::OnMouseUp(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y)
  {
  }
--- 312,349 ----
  }
  
! void __stdcall CMainDlg::OnVidCtlDblClick()
  {
!     ATLTRACE("OnVidCtlDblClick\n");
  }
  
! void __stdcall CMainDlg::OnVidCtlError(short Number, BSTR* pDescription, long Scode, BSTR Source, BSTR HelpFile, long HelpContext, boolean* pCancelDisplay)
  {
!     ATLTRACE("OnVidCtlError %04x\n", Number);
  }
  
! void __stdcall CMainDlg::OnVidCtlKeyDown(short* pKeyCode, short Shift)
  {
!     ATLTRACE("OnVidCtlKeyDown %04x\n", *pKeyCode);
  }
  
! void __stdcall CMainDlg::OnVidCtlKeyPress(short* pKeyCode)
  {
!     ATLTRACE("OnVidCtlKeyPress %04x\n", *pKeyCode);
  }
  
! void __stdcall CMainDlg::OnVidCtlKeyUp(short* pKeyCode, short Shift)
  {
!     ATLTRACE("OnVidCtlKeyUp %04x\n", *pKeyCode);
  }
  
! void __stdcall CMainDlg::OnVidCtlMouseDown(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y)
  {
  }
  
! void __stdcall CMainDlg::OnVidCtlMouseMove(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y)
  {
  }
  
! void __stdcall CMainDlg::OnVidCtlMouseUp(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y)
  {
  }
***************
*** 661,664 ****
--- 663,669 ----
  //
  // $Log$
+ // Revision 1.7  2003/02/26 17:13:52  adcockj
+ // Bug fixes and tidy up
+ //
  // Revision 1.6  2003/02/26 08:17:55  adcockj
  // Bug Fixes

Index: MainDlg.h
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/MainDlg.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MainDlg.h	26 Feb 2003 08:17:56 -0000	1.5
--- MainDlg.h	26 Feb 2003 17:13:53 -0000	1.6
***************
*** 91,104 ****
  
  BEGIN_SINK_MAP(CMainDlg)
!     SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_CLICK, OnClick, &OnClickInfo)
!     SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_DBLCLICK, OnDblClick, &OnDblClickInfo)
!     SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_ERROREVENT, OnError, &OnErrorInfo)
!     SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_KEYDOWN, OnKeyDown, &OnKeyDownInfo)
!     SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_KEYPRESS, OnKeyPress, &OnKeyPressInfo)
!     SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_KEYUP, OnKeyUp, &OnKeyUpInfo)
!     SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_MOUSEDOWN, OnMouseDown, &OnMouseDownInfo)
!     SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_MOUSEMOVE, OnMouseMove, &OnMouseMoveInfo)
!     SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_MOUSEUP, OnMouseUp, &OnMouseUpInfo)
!     SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents),  dispidStateChange, OnStateChange, &OnStateChangeInfo)
  END_SINK_MAP()
  
--- 91,104 ----
  
  BEGIN_SINK_MAP(CMainDlg)
!     SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_CLICK, OnVidCtlClick, &OnClickInfo)
!     SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_DBLCLICK, OnVidCtlDblClick, &OnDblClickInfo)
!     SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_ERROREVENT, OnVidCtlError, &OnErrorInfo)
!     SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_KEYDOWN, OnVidCtlKeyDown, &OnKeyDownInfo)
!     SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_KEYPRESS, OnVidCtlKeyPress, &OnKeyPressInfo)
!     SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_KEYUP, OnVidCtlKeyUp, &OnKeyUpInfo)
!     SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_MOUSEDOWN, OnVidCtlMouseDown, &OnMouseDownInfo)
!     SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_MOUSEMOVE, OnVidCtlMouseMove, &OnMouseMoveInfo)
!     SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_MOUSEUP, OnVidCtlMouseUp, &OnMouseUpInfo)
!     SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents),  dispidStateChange, OnVidCtlStateChange, &OnStateChangeInfo)
  END_SINK_MAP()
  
***************
*** 142,155 ****
  private:
      void ResizeVideoControl();
!     void __stdcall OnClick();
!     void __stdcall OnDblClick();
!     void __stdcall OnError(short Number, BSTR* pDescription, long Scode, BSTR Source, BSTR HelpFile, long HelpContext, boolean* pCancelDisplay);
!     void __stdcall OnKeyDown(short* pKeyCode, short Shift);
!     void __stdcall OnKeyPress(short* pKeyCode);
!     void __stdcall OnKeyUp(short* pKeyCode, short Shift);
!     void __stdcall OnMouseDown(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y);
!     void __stdcall OnMouseMove(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y);
!     void __stdcall OnMouseUp(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y);
!     void __stdcall OnStateChange(MSVidCtlStateList PrevState, MSVidCtlStateList CurrState);
      HRESULT LoadUpDefaultTuneRequest();
      HRESULT CreateTuneReqStore();
--- 142,155 ----
  private:
      void ResizeVideoControl();
!     void __stdcall OnVidCtlClick();
!     void __stdcall OnVidCtlDblClick();
!     void __stdcall OnVidCtlError(short Number, BSTR* pDescription, long Scode, BSTR Source, BSTR HelpFile, long HelpContext, boolean* pCancelDisplay);
!     void __stdcall OnVidCtlKeyDown(short* pKeyCode, short Shift);
!     void __stdcall OnVidCtlKeyPress(short* pKeyCode);
!     void __stdcall OnVidCtlKeyUp(short* pKeyCode, short Shift);
!     void __stdcall OnVidCtlMouseDown(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y);
!     void __stdcall OnVidCtlMouseMove(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y);
!     void __stdcall OnVidCtlMouseUp(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y);
!     void __stdcall OnVidCtlStateChange(MSVidCtlStateList PrevState, MSVidCtlStateList CurrState);
      HRESULT LoadUpDefaultTuneRequest();
      HRESULT CreateTuneReqStore();

--- MSVidCtlComp.cpp DELETED ---

--- MSVidCtlComp.h DELETED ---

--- MSVidCtlComp.rgs DELETED ---

--- cleverte.ico DELETED ---

--- msvidctl.bmp DELETED ---