Skip to content

Commit f2d7e4a

Browse files
author
shalstvedt
committed
License and other code cleanup
git-svn-id: http://nuicode.svnrepository.com/svn/ccf@58 49704ecc-8926-4d56-a4d4-72374b29732b
1 parent 18bdf5b commit f2d7e4a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+346
-483
lines changed

‎ccx/ccx.h

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
// ccx master include
1+
/////////////////////////////////////////////////////////////////////////////
2+
// Name: ccx/ccx.h
3+
// Purpose: CCX master include
4+
// Author: Scott Halstvedt
5+
// Copyright: (c) 2011 NUI Group
6+
/////////////////////////////////////////////////////////////////////////////
7+
8+
/***********************************************************************
9+
** Some parts Copyright (C) 2010 Movid Authors. All rights reserved.
10+
**
11+
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12+
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13+
**********************************************************************/
214

315
#include "ccxLog.h"
416
#include "ccxDaemon.h"

‎ccx/ccxDaemon.cpp

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
1+
/////////////////////////////////////////////////////////////////////////////
2+
// Name: ccx/ccxDaemon.cpp
3+
// Author: Scott Halstvedt
4+
// Copyright: (c) 2011 NUI Group
5+
/////////////////////////////////////////////////////////////////////////////
6+
17
/***********************************************************************
2-
** Copyright (C) 2010 Movid Authors. All rights reserved.
3-
**
4-
** This file is part of the Movid Software.
5-
**
6-
** This file may be distributed under the terms of the Q Public License
7-
** as defined by Trolltech AS of Norway and appearing in the file
8-
** LICENSE included in the packaging of this file.
8+
** Some parts Copyright (C) 2010 Movid Authors. All rights reserved.
99
**
1010
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
1111
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
12-
**
13-
** Contact [email protected] if any conditions of this licensing are
14-
** not clear to you.
15-
**
1612
**********************************************************************/
1713

1814

‎ccx/ccxDaemon.h

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
1+
/////////////////////////////////////////////////////////////////////////////
2+
// Name: ccx/ccxDaemon.h
3+
// Author: Scott Halstvedt
4+
// Copyright: (c) 2011 NUI Group
5+
/////////////////////////////////////////////////////////////////////////////
6+
17
/***********************************************************************
2-
** Copyright (C) 2010 Movid Authors. All rights reserved.
3-
**
4-
** This file is part of the Movid Software.
5-
**
6-
** This file may be distributed under the terms of the Q Public License
7-
** as defined by Trolltech AS of Norway and appearing in the file
8-
** LICENSE included in the packaging of this file.
8+
** Some parts Copyright (C) 2010 Movid Authors. All rights reserved.
99
**
1010
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
1111
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
12-
**
13-
** Contact [email protected] if any conditions of this licensing are
14-
** not clear to you.
15-
**
1612
**********************************************************************/
1713

1814

‎ccx/ccxDataGenericContainer.cpp

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,18 @@
1+
/////////////////////////////////////////////////////////////////////////////
2+
// Name: ccx/ccxDataGenericContainer.cpp
3+
// Author: Scott Halstvedt
4+
// Copyright: (c) 2011 NUI Group
5+
/////////////////////////////////////////////////////////////////////////////
6+
17
/***********************************************************************
2-
** Copyright (C) 2010 Movid Authors. All rights reserved.
3-
**
4-
** This file is part of the Movid Software.
5-
**
6-
** This file may be distributed under the terms of the Q Public License
7-
** as defined by Trolltech AS of Norway and appearing in the file
8-
** LICENSE included in the packaging of this file.
8+
** Some parts Copyright (C) 2010 Movid Authors. All rights reserved.
99
**
1010
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
1111
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
12-
**
13-
** Contact [email protected] if any conditions of this licensing are
14-
** not clear to you.
15-
**
1612
**********************************************************************/
1713

1814

1915
#include "ccxDataGenericContainer.h"
20-
#include "ccxProperty.h"
2116

2217
ccxDataGenericContainer::ccxDataGenericContainer() {
2318
}

‎ccx/ccxDataGenericContainer.h

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
1+
/////////////////////////////////////////////////////////////////////////////
2+
// Name: ccx/ccxDataGenericContainer.h
3+
// Author: Scott Halstvedt
4+
// Copyright: (c) 2011 NUI Group
5+
/////////////////////////////////////////////////////////////////////////////
6+
17
/***********************************************************************
2-
** Copyright (C) 2010 Movid Authors. All rights reserved.
3-
**
4-
** This file is part of the Movid Software.
5-
**
6-
** This file may be distributed under the terms of the Q Public License
7-
** as defined by Trolltech AS of Norway and appearing in the file
8-
** LICENSE included in the packaging of this file.
8+
** Some parts Copyright (C) 2010 Movid Authors. All rights reserved.
99
**
1010
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
1111
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
12-
**
13-
** Contact [email protected] if any conditions of this licensing are
14-
** not clear to you.
15-
**
1612
**********************************************************************/
1713

1814

1915
#ifndef CCX_DATASTRUCT_H
2016
#define CCX_DATASTRUCT_H
2117

18+
#include "ccxProperty.h"
19+
2220
#include <string>
2321
#include <map>
2422
#include <vector>

‎ccx/ccxDataStream.cpp

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1+
/////////////////////////////////////////////////////////////////////////////
2+
// Name: ccx/ccxDataStream.cpp
3+
// Author: Scott Halstvedt
4+
// Copyright: (c) 2011 NUI Group
5+
/////////////////////////////////////////////////////////////////////////////
6+
7+
18
/***********************************************************************
2-
** Copyright (C) 2010 Movid Authors. All rights reserved.
3-
**
4-
** This file is part of the Movid Software.
5-
**
6-
** This file may be distributed under the terms of the Q Public License
7-
** as defined by Trolltech AS of Norway and appearing in the file
8-
** LICENSE included in the packaging of this file.
9+
** Some parts Copyright (C) 2010 Movid Authors. All rights reserved.
910
**
1011
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
1112
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
12-
**
13-
** Contact [email protected] if any conditions of this licensing are
14-
** not clear to you.
15-
**
1613
**********************************************************************/
1714

1815

‎ccx/ccxDataStream.h

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1+
/////////////////////////////////////////////////////////////////////////////
2+
// Name: ccx/ccxDataStream.h
3+
// Author: Scott Halstvedt
4+
// Copyright: (c) 2011 NUI Group
5+
/////////////////////////////////////////////////////////////////////////////
6+
7+
18
/***********************************************************************
2-
** Copyright (C) 2010 Movid Authors. All rights reserved.
3-
**
4-
** This file is part of the Movid Software.
5-
**
6-
** This file may be distributed under the terms of the Q Public License
7-
** as defined by Trolltech AS of Norway and appearing in the file
8-
** LICENSE included in the packaging of this file.
9+
** Some parts Copyright (C) 2010 Movid Authors. All rights reserved.
910
**
1011
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
1112
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
12-
**
13-
** Contact [email protected] if any conditions of this licensing are
14-
** not clear to you.
15-
**
1613
**********************************************************************/
1714

1815

‎ccx/ccxFactory.cpp

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
1+
/////////////////////////////////////////////////////////////////////////////
2+
// Name: ccx/ccxFactory.cpp
3+
// Author: Scott Halstvedt
4+
// Copyright: (c) 2011 NUI Group
5+
/////////////////////////////////////////////////////////////////////////////
6+
7+
18
/***********************************************************************
2-
** Copyright (C) 2010 Movid Authors. All rights reserved.
3-
**
4-
** This file is part of the Movid Software.
5-
**
6-
** This file may be distributed under the terms of the Q Public License
7-
** as defined by Trolltech AS of Norway and appearing in the file
8-
** LICENSE included in the packaging of this file.
9+
** Some parts Copyright (C) 2010 Movid Authors. All rights reserved.
910
**
1011
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
1112
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
12-
**
13-
** Contact [email protected] if any conditions of this licensing are
14-
** not clear to you.
15-
**
1613
**********************************************************************/
1714

1815

19-
#include <string>
20-
21-
#include "ccxLog.h"
2216
#include "ccxFactory.h"
2317

2418
#define REGISTER_MODULE(name) \

‎ccx/ccxFactory.h

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1+
/////////////////////////////////////////////////////////////////////////////
2+
// Name: ccx/ccxFactory.h
3+
// Author: Scott Halstvedt
4+
// Copyright: (c) 2011 NUI Group
5+
/////////////////////////////////////////////////////////////////////////////
6+
7+
18
/***********************************************************************
2-
** Copyright (C) 2010 Movid Authors. All rights reserved.
3-
**
4-
** This file is part of the Movid Software.
5-
**
6-
** This file may be distributed under the terms of the Q Public License
7-
** as defined by Trolltech AS of Norway and appearing in the file
8-
** LICENSE included in the packaging of this file.
9+
** Some parts Copyright (C) 2010 Movid Authors. All rights reserved.
910
**
1011
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
1112
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
12-
**
13-
** Contact [email protected] if any conditions of this licensing are
14-
** not clear to you.
15-
**
1613
**********************************************************************/
1714

1815

@@ -23,6 +20,7 @@
2320
#include <map>
2421
#include <string>
2522

23+
#include "ccxLog.h"
2624
#include "ccxModule.h"
2725

2826
typedef ccxModule *(*ccxFactoryCreateCallback)();

‎ccx/ccxLog.cpp

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,19 @@
1+
/////////////////////////////////////////////////////////////////////////////
2+
// Name: ccx/ccxLog.cpp
3+
// Author: Scott Halstvedt
4+
// Copyright: (c) 2011 NUI Group
5+
/////////////////////////////////////////////////////////////////////////////
6+
7+
18
/***********************************************************************
2-
** Copyright (C) 2010 Movid Authors. All rights reserved.
3-
**
4-
** This file is part of the Movid Software.
5-
**
6-
** This file may be distributed under the terms of the Q Public License
7-
** as defined by Trolltech AS of Norway and appearing in the file
8-
** LICENSE included in the packaging of this file.
9+
** Some parts Copyright (C) 2010 Movid Authors. All rights reserved.
910
**
1011
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
1112
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
12-
**
13-
** Contact [email protected] if any conditions of this licensing are
14-
** not clear to you.
15-
**
1613
**********************************************************************/
1714

1815

19-
#include <time.h>
20-
#include <stdlib.h>
21-
2216
#include "ccxLog.h"
23-
#include "pasync.h"
24-
25-
#ifndef WIN32
26-
#include <syslog.h>
27-
#endif
2817

2918
static pt::mutex(logmtx);
3019

‎ccx/ccxLog.h

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1+
/////////////////////////////////////////////////////////////////////////////
2+
// Name: ccx/ccxLog.h
3+
// Author: Scott Halstvedt
4+
// Copyright: (c) 2011 NUI Group
5+
/////////////////////////////////////////////////////////////////////////////
6+
7+
18
/***********************************************************************
2-
** Copyright (C) 2010 Movid Authors. All rights reserved.
3-
**
4-
** This file is part of the Movid Software.
5-
**
6-
** This file may be distributed under the terms of the Q Public License
7-
** as defined by Trolltech AS of Norway and appearing in the file
8-
** LICENSE included in the packaging of this file.
9+
** Some parts Copyright (C) 2010 Movid Authors. All rights reserved.
910
**
1011
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
1112
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
12-
**
13-
** Contact [email protected] if any conditions of this licensing are
14-
** not clear to you.
15-
**
1613
**********************************************************************/
1714

1815

@@ -22,6 +19,14 @@
2219
#include <sstream>
2320
#include <iostream>
2421
#include <string>
22+
#include "pasync.h"
23+
24+
#include <time.h>
25+
#include <stdlib.h>
26+
27+
#ifndef WIN32
28+
#include <syslog.h>
29+
#endif
2530

2631
#ifdef NO_LOG
2732

‎ccx/ccxModule.cpp

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1+
/////////////////////////////////////////////////////////////////////////////
2+
// Name: ccx/ccxModule.cpp
3+
// Author: Scott Halstvedt
4+
// Copyright: (c) 2011 NUI Group
5+
/////////////////////////////////////////////////////////////////////////////
6+
7+
18
/***********************************************************************
2-
** Copyright (C) 2010 Movid Authors. All rights reserved.
3-
**
4-
** This file is part of the Movid Software.
5-
**
6-
** This file may be distributed under the terms of the Q Public License
7-
** as defined by Trolltech AS of Norway and appearing in the file
8-
** LICENSE included in the packaging of this file.
9+
** Some parts Copyright (C) 2010 Movid Authors. All rights reserved.
910
**
1011
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
1112
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
12-
**
13-
** Contact [email protected] if any conditions of this licensing are
14-
** not clear to you.
15-
**
1613
**********************************************************************/
1714

1815

@@ -372,7 +369,7 @@ void ccxModule::notifyUpdate() {
372369
// If a module was added AFTER the pipeline was started,
373370
// start it manually.
374371
if (!this->is_started)
375-
// XXX Is this the right place?
372+
// XXX Is this the right place? Or the right thing to do?
376373
this->start();
377374
this->need_update = true;
378375
if ( this->use_thread )

0 commit comments

Comments
 (0)