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

List:       freebob-cvs
Subject:    [Freebob-cvs] libfreebob/tests test-freebob.c,1.9,1.10 Makefile.am,1.3,1.4
From:       Daniel Wagner <wagi () users ! sourceforge ! net>
Date:       2006-03-29 22:57:52
Message-ID: E1FOjcN-0002az-51 () mail ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/freebob/libfreebob/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4988/tests

Modified Files:
	test-freebob.c Makefile.am 
Log Message:
2006-03-30  Daniel Wagner  <wagi@monom.org>

	* configure.ac: Version bump to 0.6.0

	* src/*: Verbose bool turned int verbose level.
	
	* src/libfreebobavc/*: Moved fire implementation to 
	base class (AVCCommand). 
	
	* libfreebob/freebob.h: freebob_sleep_after_avc_command
	workaround added.

	* tests/test-freebob.c: Verbose bool turned into verbose level.
	Workaround: sleep after avc command added.

	* tests/streaming/Makefile.am (*_SOURCES): Added libavc1394 to LDADD.
	* tests/Makefile.am (*_SOURCES): Likewise.
	
	* tests/streaming/teststreaming2.c (fid_in): compiler warning fixed.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/freebob/libfreebob/tests/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	28 Feb 2006 13:53:37 -0000	1.3
--- Makefile.am	29 Mar 2006 22:57:50 -0000	1.4
***************
*** 25,32 ****
  
  test_freebob_SOURCES = test-freebob.c
! test_freebob_LDADD   = $(top_builddir)/src/libfreebob.la $(LIBXML_LIBS)
  
  test_extplugcmd_SOURCES = test-extplugcmd.cpp
! test_extplugcmd_LDADD = $(top_builddir)/src/libfreebobavc/libfreebobavc.la
  
  #TESTS_ENVIRONMENT
--- 25,32 ----
  
  test_freebob_SOURCES = test-freebob.c
! test_freebob_LDADD   = $(top_builddir)/src/libfreebob.la $(LIBXML_LIBS) -lavc1394
  
  test_extplugcmd_SOURCES = test-extplugcmd.cpp
! test_extplugcmd_LDADD = $(top_builddir)/src/libfreebobavc/libfreebobavc.la -lavc1394
  
  #TESTS_ENVIRONMENT

Index: test-freebob.c
===================================================================
RCS file: /cvsroot/freebob/libfreebob/tests/test-freebob.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** test-freebob.c	4 Mar 2006 17:42:33 -0000	1.9
--- test-freebob.c	29 Mar 2006 22:57:50 -0000	1.10
***************
*** 50,53 ****
--- 50,54 ----
      int   node_id;
      int   node_id_set;
+     int   time;
      char* args[2];  
  };
***************
*** 55,63 ****
  // The options we understand.
  static struct argp_option options[] = {
!     {"verbose",  'v',    0,    0,  "Produce verbose output" },
!     {"quiet",    'q',    0,    0,  "Don't produce any output" },
!     {"silent",   's',    0,    OPTION_ALIAS },
!     {"node",     'n', "id",    0,  "Node to use" },
!     {"port",     'p', "nr",    0,  "IEEE1394 Port to use" },
      { 0 }
  };
--- 56,68 ----
  // The options we understand.
  static struct argp_option options[] = {
!     {"quiet",    'q',       0,    0,  "Don't produce any output" },
!     {"silent",   's',       0,    OPTION_ALIAS },
! 
!     {"verbose",  'v', "level",    0,  "Produce verbose output" },
! 
! 
!     {"node",     'n',    "id",    0,  "Node to use" },
!     {"port",     'p',    "nr",    0,  "IEEE1394 Port to use" },
!     {"time",     't',    "time",  0,  "Workaround: sleep <time> usec after AVC command\n" },
      { 0 }
  };
***************
*** 79,83 ****
  	    break;
  	case 'v':
! 	    arguments->verbose = 1;
  	    break;
  	case 'p':
--- 84,103 ----
  	    break;
  	case 'v':
! 	    if (arg) {
! 		arguments->verbose = strtol( arg, &tail, 0 );
! 		if ( errno ) {
! 		    fprintf( stderr,  "Could not parse 'verbose' argument\n" );
! 		    return ARGP_ERR_UNKNOWN;
! 		}
! 	    }
! 	    break;
! 	case 't':
! 	    if (arg) {
! 		arguments->time = strtol( arg, &tail, 0 );
! 		if ( errno ) {
! 		    fprintf( stderr,  "Could not parse 'time' argument\n" );
! 		    return ARGP_ERR_UNKNOWN;
! 		}
! 	    }
  	    break;
  	case 'p':
***************
*** 143,146 ****
--- 163,167 ----
      arguments.node_id     = 0;
      arguments.node_id_set = 0; // if we don't specify a node, discover all
+     arguments.time        = 0;
      arguments.args[0]     = "";
      arguments.args[1]     = "";
***************
*** 153,158 ****
--- 174,183 ----
      }
  
+     printf("verbose level = %d\n", arguments.verbose);
+ 
      printf( "Using freebob library version: %s\n\n", freebob_get_version() );
  
+     freebob_sleep_after_avc_command( arguments.time );
+ 
      if ( strcmp( arguments.args[0], "discover" ) == 0 ) {
  	freebob_handle_t fb_handle = freebob_new_handle( arguments.port );



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Freebob-cvs mailing list
Freebob-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/freebob-cvs
[prev in list] [next in list] [prev in thread] [next in thread]