Skip to content

Commit

Permalink
Simplify ECVCaptureDevice subclassing by importing common files in he…
Browse files Browse the repository at this point in the history
…ader.
  • Loading branch information
btrask committed May 27, 2013
1 parent 92fe5c1 commit 0d0b7fa
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 23 deletions.
11 changes: 7 additions & 4 deletions ECVCaptureDevice.h
Expand Up @@ -24,12 +24,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
#import "ECVConfigController.h"
#import "ECVAVTarget.h"

// For subclassers
#import "ECVVideoSource.h"
#import "ECVVideoFormat.h"
#import "ECVVideoStorage.h"
#import "ECVPixelBuffer.h"
#import "ECVPixelFormat.h"

// Models
@class ECVCaptureDocument;
@class ECVVideoSource;
@class ECVVideoFormat;
@class ECVVideoStorage;
@class ECVPixelBuffer;
@class ECVVideoFrame;

extern NSString *const ECVDeinterlacingModeKey;
Expand Down
5 changes: 0 additions & 5 deletions ECVEM2860Device.m
Expand Up @@ -13,11 +13,6 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#import "ECVEM2860Device.h"
#import "ECVVideoSource.h"
#import "ECVVideoFormat.h"
#import "ECVVideoStorage.h"
#import "ECVPixelBuffer.h"
#import "ECVPixelFormat.h"

static void ECVPixelFormatHack(uint16_t *const bytes, size_t const len) {
for(size_t i = 0; i < len / sizeof(uint16_t); ++i) bytes[i] = CFSwapInt16(bytes[i]);
Expand Down
9 changes: 0 additions & 9 deletions ECVSTK1160Device.m
Expand Up @@ -21,16 +21,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
#import "ECVSTK1160Device.h"
#import "stk11xx.h"

// Video
#import "ECVVideoSource.h"
#import "ECVVideoFormat.h"
#import "ECVVideoStorage.h"
#import "ECVPixelBuffer.h"

// Other Sources
#import "ECVDebug.h"
#import "ECVPixelFormat.h"

enum {
ECVSTK1160HighFieldFlag = 1 << 6,
Expand Down
5 changes: 0 additions & 5 deletions ECVSomagicDevice.m
Expand Up @@ -20,12 +20,7 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
#import "ECVSomagicDevice.h"
#import "ECVVideoSource.h"
#import "ECVVideoFormat.h"
#import "ECVDebug.h"
#import "ECVPixelBuffer.h"
#import "ECVVideoStorage.h"
#import "ECVPixelFormat.h"

#define RECV(request, idx, val, ...) \
do { \
Expand Down

0 comments on commit 0d0b7fa

Please sign in to comment.