#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
-#include <adaptor-impl.h>
+#include <singleton-service-impl.h>
namespace // unnamed namespace
{
+const char* const SIGNAL_TILTED = "tilted";
+
const int NUMBER_OF_SAMPLES = 10;
const float MAX_ACCELEROMETER_XY_VALUE = 9.8f;
// Type Registration
-Dali::BaseHandle Create()
+Dali::BaseHandle GetInstance()
{
return Dali::Internal::Adaptor::TiltSensor::Get();
}
-Dali::TypeRegistration typeRegistration( typeid(Dali::TiltSensor), typeid(Dali::BaseHandle), Create );
+Dali::TypeRegistration typeRegistration( typeid(Dali::TiltSensor), typeid(Dali::BaseHandle), GetInstance );
-Dali::SignalConnectorType signalConnector1( typeRegistration, Dali::TiltSensor::SIGNAL_TILTED, Dali::Internal::Adaptor::TiltSensor::DoConnectSignal );
+Dali::SignalConnectorType signalConnector1( typeRegistration, SIGNAL_TILTED, Dali::Internal::Adaptor::TiltSensor::DoConnectSignal );
} // unnamed namespace
{
Dali::TiltSensor sensor;
- if ( Adaptor::IsAvailable() )
+ Dali::SingletonService service( SingletonService::Get() );
+ if ( service )
{
// Check whether the keyboard focus manager is already created
- Dali::BaseHandle handle = Dali::Adaptor::Get().GetSingleton( typeid( Dali::TiltSensor ) );
+ Dali::BaseHandle handle = service.GetSingleton( typeid( Dali::TiltSensor ) );
if(handle)
{
// If so, downcast the handle of singleton to keyboard focus manager
else
{
// Create a singleton instance
- Adaptor& adaptorImpl( Adaptor::GetImplementation( Adaptor::Get() ) );
sensor = TiltSensor::New();
- adaptorImpl.RegisterSingleton( typeid( sensor ), sensor );
+ service.Register( typeid( sensor ), sensor );
handle = sensor;
}
}
return mRotation;
}
-TiltSensor::TiltedSignalV2& TiltSensor::TiltedSignal()
+TiltSensor::TiltedSignalType& TiltSensor::TiltedSignal()
{
- return mTiltedSignalV2;
+ return mTiltedSignal;
}
void TiltSensor::SetUpdateFrequency( float frequencyHertz )
bool connected( true );
TiltSensor* sensor = dynamic_cast<TiltSensor*>( object );
- if( sensor &&
- Dali::TiltSensor::SIGNAL_TILTED == signalName )
+ if( sensor && ( SIGNAL_TILTED == signalName ) )
{
sensor->TiltedSignal().Connect( tracker, functor );
}
mSensorFrameworkHandle( -1 ),
mRoll( 0.0f ),
mPitch( 0.0f ),
- mRotation( 0.0f, Vector3::YAXIS ),
+ mRotation( Dali::ANGLE_0, Vector3::YAXIS ),
mRotationThreshold( 0.0f )
{
mRollValues.resize( NUMBER_OF_SAMPLES, 0.0f );
mPitch = newPitch;
mRotation = newRotation;
- if ( !mTiltedSignalV2.Empty() )
+ if ( !mTiltedSignal.Empty() )
{
Dali::TiltSensor handle( this );
- mTiltedSignalV2.Emit( handle );
+ mTiltedSignal.Emit( handle );
}
}