code style

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20821 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.cpp

@@ -1,30 +1,8 @@
 /*
- * multiaudio replacement media addon for BeOS
- *
  * Copyright (c) 2002, Jerome Duval ([email protected])
- *
+ * Distributed under the terms of the MIT License.
- * All rights reserved.
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation 
- *   and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS 
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
  */
+
 #include <MediaDefs.h>
 #include <MediaAddOn.h>
 #include <Errors.h>
@@ -147,8 +125,8 @@ BMediaNode * MultiAudioAddOn::InstantiateNodeFor(
 	}
 #endif
 
-	MultiAudioNode * node
+	MultiAudioNode * node =
-		= new MultiAudioNode(this,
+		new MultiAudioNode(this,
 			device->MD.friendly_name,
 			device,
 			info->internal_id,

src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.h

@@ -1,30 +1,8 @@
 /*
- * multiaudio replacement media addon for BeOS
- *
  * Copyright (c) 2002, Jerome Duval ([email protected])
- *
+ * Distributed under the terms of the MIT License.
- * All rights reserved.
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation 
- *   and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS 
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
  */
+
 #ifndef _MULTIAUDIOADDON_H
 #define _MULTIAUDIOADDON_H
 

src/add-ons/media/media-add-ons/multi_audio/MultiAudioDevice.cpp

@@ -1,30 +1,8 @@
 /*
- * multiaudio replacement media addon for BeOS
+ * Copyright (c) 2002-2007, Jerome Duval ([email protected])
- *
+ * Distributed under the terms of the MIT License.
- * Copyright (c) 2002, 2003, Jerome Duval ([email protected])
- *
- * All rights reserved.
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation 
- *   and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS 
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
  */
+
 #include "MultiAudioDevice.h"
 #include "debug.h"
 #include "driver_io.h"
@@ -51,6 +29,7 @@ float MultiAudioDevice::convert_multiaudio_rate_to_media_rate(uint32 rate)
 	return 0.0;
 }
 
+
 uint32 MultiAudioDevice::convert_media_rate_to_multiaudio_rate(float rate)
 {
 	uint8 count = 0;
@@ -63,6 +42,7 @@ uint32 MultiAudioDevice::convert_media_rate_to_multiaudio_rate(float rate)
 	return 0;
 }
 
+
 uint32 MultiAudioDevice::convert_multiaudio_format_to_media_format(uint32 fmt)
 {
 	switch (fmt) {
@@ -121,6 +101,7 @@ uint32 MultiAudioDevice::convert_media_format_to_multiaudio_format(uint32 fmt)
 	}
 }
 
+
 uint32 MultiAudioDevice::select_multiaudio_rate(uint32 rate)
 {
 	//highest rate
@@ -133,6 +114,7 @@ uint32 MultiAudioDevice::select_multiaudio_rate(uint32 rate)
 	return 0;
 }
 
+
 uint32 MultiAudioDevice::select_multiaudio_format(uint32 fmt)
 {
 	//highest format

src/add-ons/media/media-add-ons/multi_audio/MultiAudioDevice.h

@@ -1,30 +1,8 @@
 /*
- * multiaudio replacement media addon for BeOS
+ * Copyright (c) 2002-2007, Jerome Duval ([email protected])
- *
+ * Distributed under the terms of the MIT License.
- * Copyright (c) 2002, 2003, Jerome Duval ([email protected])
- *
- * All rights reserved.
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation 
- *   and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS 
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
  */
+
 #ifndef _MULTIAUDIODEVICE_H
 #define _MULTIAUDIODEVICE_H