Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLMC
Commits
f01a7cba
Commit
f01a7cba
authored
Oct 11, 2009
by
Hugo Beauzee-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactoring is complete at build time.
Synchro should work, from a theorical point of view.
parent
570cbf5d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
14 deletions
+11
-14
src/Workflow/MainWorkflow.cpp
src/Workflow/MainWorkflow.cpp
+7
-1
src/Workflow/MainWorkflow.h
src/Workflow/MainWorkflow.h
+2
-2
src/Workflow/TrackHandler.cpp
src/Workflow/TrackHandler.cpp
+1
-9
src/Workflow/TrackHandler.h
src/Workflow/TrackHandler.h
+1
-2
No files found.
src/Workflow/MainWorkflow.cpp
View file @
f01a7cba
...
...
@@ -50,6 +50,7 @@ MainWorkflow::MainWorkflow( int trackCount ) :
TrackWorkflow
::
TrackType
trackType
=
(
i
==
0
?
TrackWorkflow
::
Video
:
TrackWorkflow
::
Audio
);
m_tracks
[
i
]
=
new
TrackHandler
(
trackCount
,
trackType
);
connect
(
m_tracks
[
i
],
SIGNAL
(
tracksPaused
()
),
this
,
SLOT
(
tracksPaused
()
)
);
connect
(
m_tracks
[
i
],
SIGNAL
(
allTracksRenderCompleted
()
),
this
,
SLOT
(
tracksRenderCompleted
()
)
);
}
m_outputBuffers
=
new
OutputBuffers
;
}
...
...
@@ -184,12 +185,17 @@ void MainWorkflow::moveClip( const QUuid& clipUuid, unsigned int oldTr
unsigned
int
newTrack
,
qint64
startingFrame
,
TrackWorkflow
::
TrackType
trackType
,
bool
undoRedoCommand
/*= false*/
)
{
m_tracks
[
trackType
]
->
moveClip
(
clipUuid
,
oldTrack
,
newTrack
,
startingFrame
,
undoRedoCommand
);
m_tracks
[
trackType
]
->
moveClip
(
clipUuid
,
oldTrack
,
newTrack
,
startingFrame
);
computeLength
();
if
(
undoRedoCommand
==
true
)
{
emit
clipMoved
(
clipUuid
,
newTrack
,
startingFrame
,
trackType
);
}
}
Clip
*
MainWorkflow
::
removeClip
(
const
QUuid
&
uuid
,
unsigned
int
trackId
,
TrackWorkflow
::
TrackType
trackType
)
{
emit
clipRemoved
(
uuid
,
trackId
,
trackType
);
return
m_tracks
[
trackType
]
->
removeClip
(
uuid
,
trackId
);
}
...
...
src/Workflow/MainWorkflow.h
View file @
f01a7cba
...
...
@@ -161,8 +161,8 @@ class MainWorkflow : public QObject, public Singleton<MainWorkflow>
void
mainWorkflowPaused
();
void
mainWorkflowUnpaused
();
void
clipAdded
(
Clip
*
,
unsigned
int
,
qint64
,
TrackWorkflow
::
TrackType
);
void
clipRemoved
(
QUuid
,
unsigned
int
);
void
clipMoved
(
QUuid
,
unsigned
int
,
qint64
);
void
clipRemoved
(
QUuid
,
unsigned
int
,
TrackWorkflow
::
TrackType
);
void
clipMoved
(
QUuid
,
unsigned
int
,
qint64
,
TrackWorkflow
::
TrackType
);
void
cleared
();
};
...
...
src/Workflow/TrackHandler.cpp
View file @
f01a7cba
...
...
@@ -168,7 +168,7 @@ void TrackHandler::stop()
}
void
TrackHandler
::
moveClip
(
const
QUuid
&
clipUuid
,
unsigned
int
oldTrack
,
unsigned
int
newTrack
,
qint64
startingFrame
,
bool
undoRedoCommand
/*= false*/
)
unsigned
int
newTrack
,
qint64
startingFrame
)
{
Q_ASSERT
(
newTrack
<
m_trackCount
&&
oldTrack
<
m_trackCount
);
...
...
@@ -192,12 +192,6 @@ void TrackHandler::moveClip(const QUuid& clipUuid, unsigned int oldTrack,
activateTrack
(
newTrack
);
}
computeLength
();
if
(
undoRedoCommand
==
true
)
{
//TODO
//FIXME
//emit clipMoved( clipUuid, newTrack, startingFrame );
}
}
Clip
*
TrackHandler
::
removeClip
(
const
QUuid
&
uuid
,
unsigned
int
trackId
)
...
...
@@ -207,8 +201,6 @@ Clip* TrackHandler::removeClip( const QUuid& uuid, unsigned int trackId )
Clip
*
clip
=
m_tracks
[
trackId
]
->
removeClip
(
uuid
);
computeLength
();
activateTrack
(
trackId
);
//FIXME
//emit clipRemoved( uuid, trackId );
return
clip
;
}
...
...
src/Workflow/TrackHandler.h
View file @
f01a7cba
...
...
@@ -49,8 +49,7 @@ class TrackHandler : public QObject
qint64
getClipPosition
(
const
QUuid
&
uuid
,
unsigned
int
trackId
)
const
;
void
stop
();
void
moveClip
(
const
QUuid
&
clipUuid
,
unsigned
int
oldTrack
,
unsigned
int
newTrack
,
qint64
startingFrame
,
bool
undoRedoCommand
=
false
);
unsigned
int
newTrack
,
qint64
startingFrame
);
Clip
*
removeClip
(
const
QUuid
&
uuid
,
unsigned
int
trackId
);
void
muteTrack
(
unsigned
int
trackId
);
void
unmuteTrack
(
unsigned
int
trackId
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment