From 081a5fa6db149252a499575da751c45f340312bd Mon Sep 17 00:00:00 2001 From: Joseph Spiros Date: Sat, 6 Sep 2003 18:22:15 +0000 Subject: [PATCH] A couple more modifications, as well as some comments to ease others' work on iTunes remote. --- ITMTEqualizer.h | 1 + ITMTPlayer.h | 5 ++++ ITMTPlaylist.h | 2 ++ ITMTTrack.h | 2 ++ iTunesPlayer.h | 5 +++- iTunesPlayer.m | 63 +++++++++++++++++++++++++++++++++++++++++++++++- iTunesPlaylist.h | 16 ++++++++++++ iTunesPlaylist.m | 17 +++++++++++++ iTunesRemote.m | 2 +- 9 files changed, 110 insertions(+), 3 deletions(-) create mode 100755 iTunesPlaylist.h create mode 100755 iTunesPlaylist.m diff --git a/ITMTEqualizer.h b/ITMTEqualizer.h index 664576c..909c61d 100755 --- a/ITMTEqualizer.h +++ b/ITMTEqualizer.h @@ -33,6 +33,7 @@ typedef enum { - (ITMTPlayer *)player; - (float)dBForLevel:(ITMTEqualizerLevel)level; +- (BOOL)setdB:(float)dB forLevel:(ITMTEqualizerLevel)level; @end @interface ITMTEqualizer : NSObject diff --git a/ITMTPlayer.h b/ITMTPlayer.h index 3a94ace..8ae8343 100755 --- a/ITMTPlayer.h +++ b/ITMTPlayer.h @@ -19,6 +19,11 @@ @discussion Object representation for a controlled player. Players can be defined as things that control playlist(s) objects, a pool of track objects, and possibly, equalizer objects. */ @protocol ITMTPlayer +/*! + @method writable +*/ +- (BOOL)writable; + /*! @method show */ diff --git a/ITMTPlaylist.h b/ITMTPlaylist.h index 9f2d61d..01a3f53 100755 --- a/ITMTPlaylist.h +++ b/ITMTPlaylist.h @@ -14,6 +14,8 @@ #import @protocol ITMTPlaylist +- (BOOL)writable; + - (BOOL)show; // graphical - (BOOL)setValue:(id)value forProperty:(ITMTGenericProperty)property; diff --git a/ITMTTrack.h b/ITMTTrack.h index 2ddda6d..4f45307 100755 --- a/ITMTTrack.h +++ b/ITMTTrack.h @@ -14,6 +14,8 @@ #import @protocol ITMTTrack +- (BOOL)writable; + - (BOOL)addToPlaylist:(ITMTPlaylist *)playlist; - (BOOL)addToPlaylist:(ITMTPlaylist *)playlist atIndex:(int)index; diff --git a/iTunesPlayer.h b/iTunesPlayer.h index 44f6e5e..59e0e54 100755 --- a/iTunesPlayer.h +++ b/iTunesPlayer.h @@ -10,5 +10,8 @@ #import -@interface iTunesPlayer : ITMTPlayer +@interface iTunesPlayer : ITMTPlayer { + iTunesRemote *_remote; +} + @end diff --git a/iTunesPlayer.m b/iTunesPlayer.m index 6a7b08b..cb6eb94 100755 --- a/iTunesPlayer.m +++ b/iTunesPlayer.m @@ -6,12 +6,73 @@ static iTunesPlayer *_sharediTunesPlayer = nil; -+ (id)sharedPlayer { ++ (id)sharedPlayerForRemote:(iTunesRemote *)remote { if ( _sharediTunesPlayer ) { + _remote = remote; return _sharediTunesPlayer; } else { + _remote = remote; return _sharediTunesPlayer = [[iTunesPlayer alloc] init]; } } +- (BOOL)writable { + return NO; +} + +- (BOOL)show { + return NO; +} + +- (BOOL)setValue:(id)value forProperty:(ITMTGenericProperty)property { + return NO; +} + +- (id)valueOfProperty:(ITMTGenericProperty)property { + if ( ( property == ITMTNameProperty ) { + return @"iTunes"; + } else if ( ( property == ITMTImageProperty ) { + return nil; + } else { + return nil; + } +} + +- (NSDictionary *)propertiesAndValues { + return [NSDictionary dictionaryWithObjectsAndKeys:@"iTunes",@"ITMTNameProperty",nil,@"ITMTImageProperty"]; +} + +- (ITMTRemote *)remote { + return _remote; +} + +- (ITMTPlaylist *)currentPlaylist { + // return dynamically from an AE + // (ie - [iTunesPlaylist playlistForIndex:] +} + +- (ITMTTrack *)currentTrack { + // return dynamically from an AE +} + +- (ITMTEqualizer *)currentEqualizer { + // return dynamically from an AE +} + +- (NSArray *)playlists { + // return dynamically from an AE +} + +- (NSArray *)tracks { + // return dynamically from an AE +} + +- (ITMTPlaylist *)libraryPlaylist { + // return dynamically from an AE +} + +- (NSArray *)equalizers { + // return dynamically from an AE +} + @end diff --git a/iTunesPlaylist.h b/iTunesPlaylist.h new file mode 100755 index 0000000..0a0d515 --- /dev/null +++ b/iTunesPlaylist.h @@ -0,0 +1,16 @@ +// +// iTunesPlaylist.h +// MenuTunes +// +// Created by Joseph Spiros on Sat Sep 06 2003. +// Copyright (c) 2003 __MyCompanyName__. All rights reserved. +// + +#import + + +@interface iTunesPlaylist : NSObject { + +} + +@end diff --git a/iTunesPlaylist.m b/iTunesPlaylist.m new file mode 100755 index 0000000..f571ba7 --- /dev/null +++ b/iTunesPlaylist.m @@ -0,0 +1,17 @@ +// +// iTunesPlaylist.m +// MenuTunes +// +// Created by Joseph Spiros on Sat Sep 06 2003. +// Copyright (c) 2003 __MyCompanyName__. All rights reserved. +// + +#import "iTunesPlaylist.h" + + +@implementation iTunesPlaylist + ++ (id)playlistForIndex:(int)index { +} + +@end diff --git a/iTunesRemote.m b/iTunesRemote.m index bb9e464..5781211 100755 --- a/iTunesRemote.m +++ b/iTunesRemote.m @@ -34,7 +34,7 @@ return NO; } } - if ( ( _player = [iTunesPlayer sharedPlayer] ) ) { + if ( ( _player = [iTunesPlayer sharedPlayerForRemote:self] ) ) { _activated = YES; return YES; } -- 2.20.1