From eb69e930d11ac9bc8dce8af5f790a2d23b8b2092 Mon Sep 17 00:00:00 2001 From: Jinkun Jang Date: Sat, 16 Mar 2013 01:15:00 +0900 Subject: [PATCH] merge with master --- AUTHORS | 2 - LICENSE.APLv2 => LICENSE | 2 +- NOTICE | 3 -- include/asm-error.h | 4 +- include/asm-log.h | 75 +++++++++++++++++++++++++++++++++++ include/audio-session-manager-types.h | 4 +- include/audio-session-manager.h | 4 +- packaging/audio-session-manager.spec | 7 ++-- src/audio-session-mgr.c | 4 +- 9 files changed, 87 insertions(+), 18 deletions(-) delete mode 100644 AUTHORS rename LICENSE.APLv2 => LICENSE (97%) delete mode 100644 NOTICE create mode 100644 include/asm-log.h diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 79a79b1..0000000 --- a/AUTHORS +++ /dev/null @@ -1,2 +0,0 @@ -Seungbae Shin -Sangchul Lee diff --git a/LICENSE.APLv2 b/LICENSE similarity index 97% rename from LICENSE.APLv2 rename to LICENSE index 3b739e3..9c13a9b 100644 --- a/LICENSE.APLv2 +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. +Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. Apache License Version 2.0, January 2004 diff --git a/NOTICE b/NOTICE deleted file mode 100644 index ccdad52..0000000 --- a/NOTICE +++ /dev/null @@ -1,3 +0,0 @@ -Copyright (c) Samsung Electronics Co., Ltd. All rights reserved. -Except as noted, this software is licensed under Apache License, Version 2. -Please, see the LICENSE file for Apache License terms and conditions. diff --git a/include/asm-error.h b/include/asm-error.h index f6d814d..9084444 100644 --- a/include/asm-error.h +++ b/include/asm-error.h @@ -1,9 +1,9 @@ /* * audio-session-manager * - * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Seungbae Shin , Sangchul Lee + * Contact: Seungbae Shin * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/include/asm-log.h b/include/asm-log.h new file mode 100644 index 0000000..16a721b --- /dev/null +++ b/include/asm-log.h @@ -0,0 +1,75 @@ +/* + * audio-session-manager + * + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Seungbae Shin + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#ifndef __ASM_LOG_H__ +#define __ASM_LOG_H__ + +#ifdef __DEBUG_MODE__ +#include + +#ifdef __USE_LOGMANAGER__ +#include + +#define LOG_TAG "MMFW_SESSIONMGR" +#define asm_info(fmt, arg...) SLOG(LOG_VERBOSE, LOG_TAG, " [%s:%d] "fmt"", __FUNCTION__,__LINE__,##arg) +#define asm_warning(fmt, arg...) SLOG(LOG_WARN, LOG_TAG, " [%s:%d] "fmt"", __FUNCTION__,__LINE__,##arg) +#define asm_error(fmt, arg...) SLOG(LOG_ERROR, LOG_TAG, " [%s:%d] "fmt"", __FUNCTION__,__LINE__,##arg) +#define asm_critical(fmt, arg...) SLOG(LOG_ERROR, LOG_TAG, " [%s:%d] "fmt"", __FUNCTION__,__LINE__,##arg) +#define asm_fenter() SLOG(LOG_VERBOSE, LOG_TAG, " [%s:%d]", __FUNCTION__,__LINE__) +#define asm_fleave() SLOG(LOG_VERBOSE, LOG_TAG, " [%s:%d]", __FUNCTION__,__LINE__) + +#else //__USE_LOGMANAGER__ + +#define asm_info_r(msg, args...) fprintf(stderr, msg, ##args) +#define asm_warning_r(msg, args...) fprintf(stderr, msg, ##args) +#define asm_error_r(msg, args...) fprintf(stderr, msg, ##args) +#define asm_critical_r(msg, args...) fprintf(stderr, msg, ##args) +#define asm_assert_r(condition) (condition) + +#define asm_info(msg, args...) fprintf(stderr, msg, ##args) +#define asm_warning(msg, args...) fprintf(stderr, msg, ##args) +#define asm_error(msg, args...) fprintf(stderr, msg, ##args) +#define asm_critical(msg, args...) fprintf(stderr, msg, ##args) +#define asm_assert(condition) (condition) +#define asm_fenter() +#define asm_fleave() + +#endif //__USE_LOGMANAGER__ + +#else //__DEBUG_MODE__ + +#define asm_info_r(msg, args...) +#define asm_warning_r(msg, args...) +#define asm_error_r(msg, args...) +#define asm_critical_r(msg, args...) +#define asm_assert_r(condition) (condition) + +#define asm_info(msg, args...) +#define asm_warning(msg, args...) +#define asm_error(msg, args...) +#define asm_critical(msg, args...) +#define asm_assert(condition) (condition) +#define asm_fenter() +#define asm_fleave() + +#endif // __DEBUG_MODE__ + +#endif /* __ASM_LOG_H__ */ diff --git a/include/audio-session-manager-types.h b/include/audio-session-manager-types.h index fa7b3fb..0219fa1 100644 --- a/include/audio-session-manager-types.h +++ b/include/audio-session-manager-types.h @@ -1,9 +1,9 @@ /* * audio-session-manager * - * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Seungbae Shin , Sangchul Lee + * Contact: Seungbae Shin * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/include/audio-session-manager.h b/include/audio-session-manager.h index a10fa6f..b7434b2 100644 --- a/include/audio-session-manager.h +++ b/include/audio-session-manager.h @@ -1,9 +1,9 @@ /* * audio-session-manager * - * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Seungbae Shin , Sangchul Lee + * Contact: Seungbae Shin * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/packaging/audio-session-manager.spec b/packaging/audio-session-manager.spec index 3853ed8..ad0a9d6 100644 --- a/packaging/audio-session-manager.spec +++ b/packaging/audio-session-manager.spec @@ -1,10 +1,9 @@ Name: audio-session-manager Summary: Audio Session Manager -Version: 0.2.7 +Version: 0.2.6 Release: 0 -Group: System/Libraries -License: Apache License, Version 2.0 -URL: http://source.tizen.org +Group: TO_BE/FILLED_IN +License: TO BE FILLED IN Source0: %{name}-%{version}.tar.gz Requires(post): /sbin/ldconfig Requires(post): /usr/bin/vconftool diff --git a/src/audio-session-mgr.c b/src/audio-session-mgr.c index 91c5feb..f8304ff 100644 --- a/src/audio-session-mgr.c +++ b/src/audio-session-mgr.c @@ -1,9 +1,9 @@ /* * audio-session-manager * - * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Seungbae Shin , Sangchul Lee + * Contact: Seungbae Shin * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. -- 2.7.4