Show
Ignore:
Timestamp:
12/25/06 07:42:25 (16 years ago)
Author:
pieterpalmers
Message:

- Merged the developments on trunk since branch-off:

branch occurred at rev 194
svn merge -r 194:HEAD https://svn.sourceforge.net/svnroot/freebob/trunk/libfreebob

- Modified libfreebobavc to use the messagebuffer for debug info.
- This should compile and run

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/libfreebob-2.0/libfreebob/freebob_streaming.h

    r235 r336  
    11/* 
    2  *   FreeBob Streaming API 
    3  *   FreeBob = Firewire (pro-)audio for linux 
     2 *   FreeBoB Streaming API 
     3 *   FreeBoB = Firewire (pro-)audio for linux 
    44 * 
    55 *   http://freebob.sf.net 
     
    2727/* freebob_streaming.h 
    2828 * 
    29  * Specification for the FreeBob Streaming API 
     29 * Specification for the FreeBoB Streaming API 
    3030 * 
    3131 */ 
     
    161161 
    162162/** 
    163  * Initializes the streaming from/to a FreeBob device. A FreeBob device 
     163 * Initializes the streaming from/to a FreeBoB device. A FreeBoB device 
    164164 * is a virtual device composed of several BeBoB or compatible devices, 
    165165 * linked together in one sync domain. 
     
    189189 
    190190/** 
    191  * Finishes the FreeBob streaming. Cleans up all internal data structures 
     191 * Finishes the FreeBoB streaming. Cleans up all internal data structures 
    192192 * and terminates connections. 
    193193 * 
     
    314314 
    315315/** 
    316  * Starts the streaming operation. This initiates the connections to the FreeBob devices and 
     316 * Starts the streaming operation. This initiates the connections to the FreeBoB devices and 
    317317 * starts the packet handling thread(s). This has to be called before any I/O can occur. 
    318318 * 
     
    324324 
    325325/** 
    326  * Stops the streaming operation. This closes the connections to the FreeBob devices and 
     326 * Stops the streaming operation. This closes the connections to the FreeBoB devices and 
    327327 * stops the packet handling thread(s).  
    328328 * 
  • branches/libfreebob-2.0/libfreebob/Makefile.am

    r222 r336  
    22# Copyright (C) 2005 by Daniel Wagner. 
    33# 
    4 # This file is part of FreeBob
     4# This file is part of FreeBoB
    55# 
    6 # FreeBob is free software; you can redistribute it and/or modify 
     6# FreeBoB is free software; you can redistribute it and/or modify 
    77# it under the terms of the GNU General Public License as published by 
    88# the Free Software Foundation; either version 2 of the License, or 
    99# (at your option) any later version. 
    10 # FreeBob is distributed in the hope that it will be useful, 
     10# FreeBoB is distributed in the hope that it will be useful, 
    1111# but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1212# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1313# GNU General Public License for more details. 
    1414# You should have received a copy of the GNU General Public License 
    15 # along with FreeBob; if not, write to the Free Software 
     15# along with FreeBoB; if not, write to the Free Software 
    1616# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
    1717 
    1818 
    1919libfreebobincludedir = $(includedir)/libfreebob 
     20 
    2021libfreebobinclude_HEADERS = freebob.h freebob_streaming.h xmlparser.h freebob_bounce.h 
    21