[Jahshaka-cvs] SF.net SVN: editopia:[190] cinesuite/cineplay-cinecode/trunk/src
Status: Beta
Brought to you by:
jahshaka
Menu
▾
▴
[Jahshaka-cvs] SF.net SVN: editopia:[190] cinesuite/cineplay-cinecode/trunk/src
|
From: <tim...@us...> - 2008-09-16 06:26:51
|
Revision: 190
http://editopia.svn.sourceforge.net/editopia/?rev=190&view=rev
Author: timdewhirst
Date: 2008-09-16 13:26:45 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
cinesuite
- more build fixes
- move frameRange.h to FrameRange.hpp [start of rationalization of naming scheme]
Modified Paths:
--------------
cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp
cinesuite/cineplay-cinecode/trunk/src/CineCode.h
cinesuite/cineplay-cinecode/trunk/src/EncodeJob.h
cinesuite/cineplay-cinecode/trunk/src/LogMessageHandler.h
cinesuite/cineplay-cinecode/trunk/src/cinecode.pro
cinesuite/cineplay-cinecode/trunk/src/olibs.pri
cinesuite/cineplay-cinecode/trunk/src/widgets/media.h
cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp
cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.hpp
cinesuite/cineplay-cinecode/trunk/src/widgets/shader_state.cpp
Added Paths:
-----------
cinesuite/cineplay-cinecode/trunk/src/FrameRange.hpp
Removed Paths:
-------------
cinesuite/cineplay-cinecode/trunk/src/frameRange.h
Modified: cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp
===================================================================
--- cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp 2008-09-16 11:28:20 UTC (rev 189)
+++ cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp 2008-09-16 13:26:45 UTC (rev 190)
@@ -39,6 +39,7 @@
#include <QApplication>
#include <QGroupBox>
#include <QMenuBar>
+#include <QMenu>
#include <QMessageBox>
#include <QLayout>
#include <QObject>
@@ -85,7 +86,7 @@
m_impl->m_timeSlider->setProperty( "enableInOutControls", true );
// encode
- Q3PopupMenu* encode = new Q3PopupMenu( m_impl->m_menubar );
+ QMenu* encode = new QMenu( m_impl->m_menubar );
encode->setPalette( m_impl->m_menubar->palette() );
encode->insertItem( tr( "&encode..." ), this, SLOT( onEncode() ) );
encode->insertItem( tr( "&cancel all" ), this, SLOT( onCancelAll() ) );
Modified: cinesuite/cineplay-cinecode/trunk/src/CineCode.h
===================================================================
--- cinesuite/cineplay-cinecode/trunk/src/CineCode.h 2008-09-16 11:28:20 UTC (rev 189)
+++ cinesuite/cineplay-cinecode/trunk/src/CineCode.h 2008-09-16 13:26:45 UTC (rev 190)
@@ -22,7 +22,7 @@
#pragma once
#include "ui_main_cinecode.h"
-#include "frameRange.h"
+#include "FrameRange.hpp"
// std
#include <list>
Modified: cinesuite/cineplay-cinecode/trunk/src/EncodeJob.h
===================================================================
--- cinesuite/cineplay-cinecode/trunk/src/EncodeJob.h 2008-09-16 11:28:20 UTC (rev 189)
+++ cinesuite/cineplay-cinecode/trunk/src/EncodeJob.h 2008-09-16 13:26:45 UTC (rev 190)
@@ -21,12 +21,10 @@
#pragma once
-#include <qstring.h>
-#include <qstringlist.h>
-#include <q3valuelist.h>
-#include <q3popupmenu.h>
+#include <QString>
+#include <QStringList>
-#include "FrameRange.h"
+#include "FrameRange.hpp"
namespace cineplay
{
Copied: cinesuite/cineplay-cinecode/trunk/src/FrameRange.hpp (from rev 188, cinesuite/cineplay-cinecode/trunk/src/frameRange.h)
===================================================================
--- cinesuite/cineplay-cinecode/trunk/src/FrameRange.hpp (rev 0)
+++ cinesuite/cineplay-cinecode/trunk/src/FrameRange.hpp 2008-09-16 13:26:45 UTC (rev 190)
@@ -0,0 +1,55 @@
+/* -*- mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */
+
+// This file is part of Cineplay
+//
+// Cineplay is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// Cineplay is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// Copyright (C) 2008 Audiotube Ltd.
+// For more information, see http://www.audiotube.com
+
+#pragma once
+
+// std
+#include <list>
+
+struct FrameRange
+{
+ FrameRange()
+ : in( -1 ), out( -1 )
+ {}
+
+ FrameRange( int in_, int out_ )
+ : in( in_ ), out( out_ )
+ {}
+
+ bool isInValid() const
+ {
+ return in > 0;
+ }
+
+ bool isValid() const
+ {
+ return isInValid() && out > 0;
+ }
+
+ int length() const
+ {
+ return out - in;
+ }
+
+ int in;
+ int out;
+};
+
+typedef std::list< FrameRange > FrameRangeList;
Modified: cinesuite/cineplay-cinecode/trunk/src/LogMessageHandler.h
===================================================================
--- cinesuite/cineplay-cinecode/trunk/src/LogMessageHandler.h 2008-09-16 11:28:20 UTC (rev 189)
+++ cinesuite/cineplay-cinecode/trunk/src/LogMessageHandler.h 2008-09-16 13:26:45 UTC (rev 190)
@@ -33,10 +33,12 @@
break;
}
case QtWarningMsg:
+ // case QtSystemMsg:
{
WARNING_LOG << "warning: " << msg;
break;
}
+ case QtCriticalMsg:
case QtFatalMsg:
{
CRITICAL_LOG << "fatal: " << msg;
Modified: cinesuite/cineplay-cinecode/trunk/src/cinecode.pro
===================================================================
--- cinesuite/cineplay-cinecode/trunk/src/cinecode.pro 2008-09-16 11:28:20 UTC (rev 189)
+++ cinesuite/cineplay-cinecode/trunk/src/cinecode.pro 2008-09-16 13:26:45 UTC (rev 190)
@@ -16,7 +16,7 @@
EncodeJob.h \
EncodeTrayEntry.h \
FilterGraph.h \
- frameRange.h
+ FrameRange.hpp
SOURCES += \
CineCode.cpp \
Deleted: cinesuite/cineplay-cinecode/trunk/src/frameRange.h
===================================================================
--- cinesuite/cineplay-cinecode/trunk/src/frameRange.h 2008-09-16 11:28:20 UTC (rev 189)
+++ cinesuite/cineplay-cinecode/trunk/src/frameRange.h 2008-09-16 13:26:45 UTC (rev 190)
@@ -1,55 +0,0 @@
-/* -*- mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */
-
-// This file is part of Cineplay
-//
-// Cineplay is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// Cineplay is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-//
-// Copyright (C) 2008 Audiotube Ltd.
-// For more information, see http://www.audiotube.com
-
-#pragma once
-
-// std
-#include <list>
-
-struct FrameRange
-{
- FrameRange()
- : in( -1 ), out( -1 )
- {}
-
- FrameRange( int in_, int out_ )
- : in( in_ ), out( out_ )
- {}
-
- bool isInValid() const
- {
- return in > 0;
- }
-
- bool isValid() const
- {
- return isInValid() && out > 0;
- }
-
- int length() const
- {
- return out - in;
- }
-
- int in;
- int out;
-};
-
-typedef std::list< FrameRange > FrameRangeList;
Modified: cinesuite/cineplay-cinecode/trunk/src/olibs.pri
===================================================================
--- cinesuite/cineplay-cinecode/trunk/src/olibs.pri 2008-09-16 11:28:20 UTC (rev 189)
+++ cinesuite/cineplay-cinecode/trunk/src/olibs.pri 2008-09-16 13:26:45 UTC (rev 190)
@@ -16,7 +16,7 @@
# For now add any link flags from the environment
LIBS += $(LDFLAGS)
- DEFINES += HAVE_CONFIG_H
+ DEFINES += HAVE_GL_GLEW_H
}
win32 {
Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/media.h
===================================================================
--- cinesuite/cineplay-cinecode/trunk/src/widgets/media.h 2008-09-16 11:28:20 UTC (rev 189)
+++ cinesuite/cineplay-cinecode/trunk/src/widgets/media.h 2008-09-16 13:26:45 UTC (rev 190)
@@ -8,6 +8,7 @@
#define JW_MEDIA_H
#include "texture.h"
+
#include <openmedialib/ml/ml.hpp>
#include <openassetlib/al/asset.hpp>
Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp
===================================================================
--- cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp 2008-09-16 11:28:20 UTC (rev 189)
+++ cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp 2008-09-16 13:26:45 UTC (rev 190)
@@ -5,9 +5,10 @@
// Released under the GPL.
// For more information, see http://www.jahshaka.org.
-#include "opengl_store.hpp"
#include "mediaPtr.h"
+#include "opengl_store.hpp"
+
// qt
#include <QLayout>
#include <QWheelEvent>
Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.hpp
===================================================================
--- cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.hpp 2008-09-16 11:28:20 UTC (rev 189)
+++ cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.hpp 2008-09-16 13:26:45 UTC (rev 190)
@@ -7,12 +7,12 @@
#pragma once
+// Must be included before any other GL headers
+#include "shader_state.h"
+
#include "config.h"
#include "widget_store.hpp"
-// Must be included before any other GL headers
-#include "shader_state.h"
-
// qt
#include <QGLWidget>
Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/shader_state.cpp
===================================================================
--- cinesuite/cineplay-cinecode/trunk/src/widgets/shader_state.cpp 2008-09-16 11:28:20 UTC (rev 189)
+++ cinesuite/cineplay-cinecode/trunk/src/widgets/shader_state.cpp 2008-09-16 13:26:45 UTC (rev 190)
@@ -1,3 +1,4 @@
+
/* -*- mode: C; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */
// jahwidgets - A widget library representation.
@@ -7,9 +8,16 @@
#include "shader_state.h"
+// std
+#include <cstring>
+
namespace jahwidgets { namespace qt3 {
-void shader_state::init( const std::string& cg_vert, const std::string& cg_frag, const std::string& glsl_vert, const std::string& glsl_frag, bool prefix )
+void shader_state::init( const std::string& cg_vert,
+ const std::string& cg_frag,
+ const std::string& glsl_vert,
+ const std::string& glsl_frag,
+ bool prefix )
{
#ifdef HAVE_CG_RUNTIME
Cg_.init( cg_vert, cg_frag, prefix );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|