Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19893/src/tv

Modified Files:
        v4l2.py ivtv.py 
Log Message:
Work on autodetecting tv cards.


Index: v4l2.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/v4l2.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** v4l2.py     11 Aug 2004 20:47:17 -0000      1.16
--- v4l2.py     12 Aug 2004 16:52:49 -0000      1.17
***************
*** 10,13 ****
--- 10,16 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.17  2004/08/12 16:52:49  rshortt
+ # Work on autodetecting tv cards.
+ #
  # Revision 1.16  2004/08/11 20:47:17  rshortt
  # Start adding some try/except.
***************
*** 287,296 ****
  
  
!     def init_settings(self):
!         (v_norm, v_input, v_clist, v_dev) = config.TV_SETTINGS.split()
!         v_norm = string.upper(v_norm)
!         self.setstd(NORMS.get(v_norm))
  
!         self.setchanlist(v_clist)
  
          # XXX TODO: make a good way of setting the input
--- 290,301 ----
  
  
!     def init_settings(self, which):
!         card = config.TV_SETTINGS.get(which)
!         if not card:
!             # XXX: print a clever error
!             return
  
!         self.setstd(NORMS.get(card.norm))
!         self.setchanlist(card.chanlist)
  
          # XXX TODO: make a good way of setting the input
***************
*** 332,352 ****
  
  
- class V4LGroup:
-     def __init__(self):
-         # Types:
-         #   tv-v4l1 - video capture card with a tv tuner using v4l1
-         #   tv-v4l2 - video capture card with a tv tuner using v4l2
-         #   video   - video capture card (v4l1 or v4l2) using an external video
-         #             source such as sattelite, digital cable box, video or
-         #             security camera.
-         #   webcam  - such as a USB webcam, these are handled a bit differently
-         #             than most other v4l devices.
- 
-         self.type = type
-         self.vdev = vdev
-         self.vinput = vinput
-         self.adev = adev
-         self.desc = desc
-         self.inuse = FALSE
- 
- 
--- 337,338 ----

Index: ivtv.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/ivtv.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ivtv.py     10 Jul 2004 12:33:41 -0000      1.13
--- ivtv.py     12 Aug 2004 16:52:49 -0000      1.14
***************
*** 10,13 ****
--- 10,16 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.14  2004/08/12 16:52:49  rshortt
+ # Work on autodetecting tv cards.
+ #
  # Revision 1.13  2004/07/10 12:33:41  dischi
  # header cleanup
***************
*** 104,112 ****
  
  
!     def init_settings(self, opts=None):
          if not opts:
              opts = config.TV_IVTV_OPTIONS
  
!         tv.v4l2.Videodev.init_settings(self)
  
          (width, height) = string.split(opts['resolution'], 'x')
--- 107,115 ----
  
  
!     def init_settings(self, which, opts=None):
          if not opts:
              opts = config.TV_IVTV_OPTIONS
  
!         tv.v4l2.Videodev.init_settings(self, which)
  
          (width, height) = string.split(opts['resolution'], 'x')



-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to