Merge pull request #2 from corporateshark/playlist

Added playlists

Author: corporateshark

README.md

@@ -17,7 +17,7 @@ Usage:
 ------
 
 ```
-portamp <filename> [--loop] [--wav-modplug]
+portamp <filename> [<filename2> ...] [--loop] [--wav-modplug] [--verbose]
 ```
 
 Features:

src/AudioSubsystem_OpenAL.cpp

@@ -14,6 +14,7 @@
 #include "AudioSubsystem_OpenAL.h"
 #include "Decoders/iWaveDataProvider.h"
 #include "OpenAL/LAL.h"
+#include "Utils.h"
 
 const int BUFFER_DURATION = 250; // milliseconds
 const int BUFFER_SIZE = 44100 * 2 * 2 * BUFFER_DURATION / 1000;
@@ -317,7 +318,7 @@ void clAudioSource_OpenAL::SetLooping( bool Looping )
 
 	bool IsStreaming = m_DataProvider && m_DataProvider->IsStreaming();
 
-	if ( !IsStreaming )
+	if ( m_DataProvider && !IsStreaming )
 	{
 		alSourcei( m_SourceID, AL_LOOPING, Looping ? AL_TRUE : AL_FALSE );
 	}
@@ -352,7 +353,7 @@ void clAudioSubsystem_OpenAL::DebugPrintVersion()
 	printf( "OpenAL version : %s\n", alGetString( AL_VERSION  ) );
 	printf( "OpenAL vendor  : %s\n", alGetString( AL_VENDOR   ) );
 	printf( "OpenAL renderer: %s\n", alGetString( AL_RENDERER ) );
-	printf( "OpenAL extensions:\n%s\n", alGetString( AL_EXTENSIONS ) );
+	printf( "OpenAL extensions:\n%s\n\n", alGetString( AL_EXTENSIONS ) );
 }
 
 void clAudioSubsystem_OpenAL::Start()
@@ -364,7 +365,7 @@ void clAudioSubsystem_OpenAL::Start()
 			m_Context = alcCreateContext( m_Device, nullptr );
 			alcMakeContextCurrent( m_Context );
 
-			DebugPrintVersion();
+			if ( IsVerbose() ) DebugPrintVersion();
 
 			m_IsInitialized = true;
 

src/Decoders/WAV/WAVDataProvider.cpp

@@ -79,13 +79,16 @@ clWAVDataProvider::clWAVDataProvider( const std::shared_ptr<clBlob>& Data )
 
 //			m_DataSize = Data->GetDataSize() - sizeof(sWAVHeader);
 
-			printf( "PCM WAVE\n" );
+			if ( IsVerbose() )
+			{
+				printf( "PCM WAVE\n" );
 
-			printf( "Channels    = %i\n", Header->Channels );
-			printf( "Samples/S   = %i\n", Header->SampleRate );
-			printf( "Bits/Sample = %i\n", Header->nBitsperSample );
+				printf( "Channels    = %i\n", Header->Channels );
+				printf( "Samples/S   = %i\n", Header->SampleRate );
+				printf( "Bits/Sample = %i\n", Header->nBitsperSample );
 
-			printf( "m_DataSize = %zu\n", m_DataSize );
+				printf( "m_DataSize = %zu\n\n", m_DataSize );
+			}
 
 		}
 	}

src/Playlist.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <deque>
+#include <string>
+
+class clPlaylist
+{
+public:
+	virtual ~clPlaylist() {};
+
+	virtual void EnqueueTrack( const char* FileName )
+	{
+		m_FileNames.emplace_back( FileName );
+	}
+
+	virtual bool IsEmpty() const { return m_FileNames.empty(); }
+	virtual size_t GetNumTracks() const { return m_FileNames.size(); }
+	virtual std::string GetAndPopNextTrack( bool Loop )
+	{
+		std::string Result = m_FileNames.front();
+
+		m_FileNames.pop_front();
+
+		// readd to the end of the list
+		if ( Loop ) m_FileNames.push_back( Result );
+
+		return Result;
+	}
+
+private:
+	std::deque<std::string> m_FileNames;
+};

src/Utils.cpp

@@ -16,6 +16,8 @@
 
 std::vector<uint8_t> ReadFileAsVector( const char* FileName )
 {
+	if ( IsVerbose() ) printf( "Opening %s\n\n", FileName );
+
 	std::ifstream File( FileName, std::ifstream::binary | std::ios::in );
 
 	if ( File.fail() )
@@ -69,6 +71,10 @@ int IsKeyPressed()
 #endif
 }
 
+bool IsVerbose()
+{
+	return g_Config.m_Verbose;
+}
 
 void Log_Error( const char* Format... )
 {

src/Utils.h

@@ -65,14 +65,19 @@ struct sConfig
 	sConfig()
 	: m_Loop( false )
 	, m_UseModPlugToDecodeWAV( false )
+	, m_Verbose( false )
 	{}
 
 	bool m_Loop;
 	bool m_UseModPlugToDecodeWAV;
+	bool m_Verbose;
 };
 
 std::shared_ptr<clBlob> ReadFileAsBlob( const char* FileName );
 
 int IsKeyPressed();
+bool IsVerbose();
 
-void Log_Error( const char* Format... );
+void Log_Error( const char* Format... );
+
+extern sConfig g_Config;

src/main.cpp

@@ -8,10 +8,12 @@
 #include "Decoders/iWaveDataProvider.h"
 #include "Decoders/WAV/WAVDataProvider.h"
 #include "Utils.h"
+#include "Playlist.h"
 
-const char* PORTAMP_VERSION = "0.99.9";
+const char* PORTAMP_VERSION = "1.0.0";
 
 sConfig g_Config;
+clPlaylist g_Playlist;
 
 sConfig ReadConfigFromCommandLine( int argc, char* argv[] )
 {
@@ -20,7 +22,9 @@ sConfig ReadConfigFromCommandLine( int argc, char* argv[] )
 	for ( int i = 1; i < argc; i++ )
 	{
 		if ( strstr( argv[i], "--loop" ) == argv[i] ) Cfg.m_Loop = true;
-		if ( strstr( argv[i], "--wav-modplug" ) == argv[i] ) Cfg.m_UseModPlugToDecodeWAV = true;
+		else if ( strstr( argv[i], "--wav-modplug" ) == argv[i] ) Cfg.m_UseModPlugToDecodeWAV = true;
+		else if ( strstr( argv[i], "--verbose" ) == argv[i] ) Cfg.m_Verbose = true;
+		else g_Playlist.EnqueueTrack( argv[i] );
 	}
 
 	return Cfg;
@@ -32,7 +36,7 @@ void PrintBanner()
 	printf( "Copyright (C) 2015 Sergey Kosarevsky\n" );
 	printf( "https://github.com/corporateshark/PortAMP\n" );
 	printf( "\n" );
-	printf( "portamp <filename> [--loop] [--wav-modplug]\n" );
+	printf( "portamp <filename1> [<filename2> ...] [--loop] [--wav-modplug] [--verbose]\n" );
 	printf( "\n" );
 }
 
@@ -46,25 +50,36 @@ int main( int argc, char* argv[] )
 
 	g_Config = ReadConfigFromCommandLine( argc, argv );
 
-	const char* FileName = ( argc > 1 ) ? argv[1] : "test.ogg";
+	if ( g_Playlist.IsEmpty() ) g_Playlist.EnqueueTrack( "test.ogg" );
 
 	auto AudioSubsystem = CreateAudioSubsystem_OpenAL();
 
 	AudioSubsystem->Start();
 
-	auto TestBlob = ReadFileAsBlob( FileName );
-	auto Provider = CreateWaveDataProvider( FileName, TestBlob );
 	auto Source = AudioSubsystem->CreateAudioSource();
-	Source->BindDataProvider( Provider );
-	Source->SetLooping( g_Config.m_Loop );
-	Source->Play();
+	// allow seamless looping if there is only one track
+	if ( g_Playlist.GetNumTracks() == 1 ) Source->SetLooping( g_Config.m_Loop );
 
-	while ( Source->IsPlaying() && !IsKeyPressed() )
+	bool RequestingExit = false;
+
+	while ( !g_Playlist.IsEmpty() && !RequestingExit )
 	{
-		std::this_thread::sleep_for( std::chrono::milliseconds(10) );
-	};
+		auto FileName = g_Playlist.GetAndPopNextTrack( g_Config.m_Loop );
+		auto DataBlob = ReadFileAsBlob( FileName.c_str() );
+		auto Provider = CreateWaveDataProvider( FileName.c_str(), DataBlob );
+		Source->BindDataProvider( Provider );
+		Source->Play();
+
+		while ( Source->IsPlaying() && !RequestingExit )
+		{
+			std::this_thread::sleep_for( std::chrono::milliseconds(10) );
+
+			if ( IsKeyPressed() ) RequestingExit = true;
+		};
+
+		Source->Stop();
+	}
 
-	Source->Stop();
 	Source = nullptr;
 
 	AudioSubsystem->Stop();