Skip to content

Commit ada6cb5

Browse files
author
Clement Champetier
committed
Add progress folder
* Contains all files related to the progress. * Also contains corresponding swig interface file. Conflicts: src/AvTranscoder/file/InputFile.hpp
1 parent 7d9d350 commit ada6cb5

File tree

6 files changed

+6
-5
lines changed

6 files changed

+6
-5
lines changed

src/AvTranscoder/avTranscoder.i

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
#include <AvTranscoder/transcoder/Transcoder.hpp>
5151
%}
5252

53-
%include "AvTranscoder/ProgressListener.i"
53+
%include "AvTranscoder/progress/ProgressListener.i"
5454

5555
namespace std {
5656
%template(IntPair) pair< size_t, size_t >;

src/AvTranscoder/file/InputFile.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
#include <AvTranscoder/codedStream/AvInputStream.hpp>
1111

1212
#include <AvTranscoder/mediaProperty/mediaProperties.hpp>
13-
#include <AvTranscoder/ProgressListener.hpp>
13+
14+
#include <AvTranscoder/progress/ProgressListener.hpp>
1415

1516
#include <AvTranscoder/Profile.hpp>
1617

src/AvTranscoder/ProgressListener.i renamed to src/AvTranscoder/progress/ProgressListener.i

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33

44
%{
5-
#include <AvTranscoder/ProgressListener.hpp>
5+
#include <AvTranscoder/progress/ProgressListener.hpp>
66
%}
77

88
/* turn on director wrapping for IProgress */
99
%feature("director") IProgress;
1010

11-
%include <AvTranscoder/ProgressListener.hpp>
11+
%include <AvTranscoder/progress/ProgressListener.hpp>

src/AvTranscoder/transcoder/Transcoder.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <AvTranscoder/essenceStream/GeneratorAudio.hpp>
1212
#include <AvTranscoder/essenceStream/GeneratorVideo.hpp>
1313

14-
#include <AvTranscoder/ProgressListener.hpp>
14+
#include <AvTranscoder/progress/ProgressListener.hpp>
1515

1616
#include <AvTranscoder/Profile.hpp>
1717

0 commit comments

Comments
 (0)