Skip to content
This repository has been archived by the owner on Sep 4, 2019. It is now read-only.

Commit

Permalink
Merge pull request #32 from phofman/master
Browse files Browse the repository at this point in the history
Created projects for Visual Studio 2013
  • Loading branch information
timwindsor committed Jan 16, 2015
2 parents a93d4db + f25e64b commit bd65789
Show file tree
Hide file tree
Showing 27 changed files with 1,203 additions and 42 deletions.
18 changes: 18 additions & 0 deletions .gitignore
@@ -0,0 +1,18 @@
*.flag
*.suo

Samples.opensdf
Samples.sdf

AudioLoopBackSample/config.pri

AudioLoopBackSample/Device-Debug/
AudioLoopBackSample/arm/
AudioLoopBackSampleToFile/Device-Debug/
BBMbpsRegistration/Device-Debug/
BBMbpsUserProfile/Device-Debug/
BtHrmPlugin/Device-Debug/
NativeAndOpenGLWindows/Device-Debug/
NativeCamera/Device-Debug/
RotateText/Device-Debug/
ToneGenerator/Device-Debug/
75 changes: 75 additions & 0 deletions AudioLoopBackSample/AudioLoopBackSample.vcxproj
@@ -0,0 +1,75 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|BlackBerry">
<Configuration>Debug</Configuration>
<Platform>BlackBerry</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|BlackBerry">
<Configuration>Release</Configuration>
<Platform>BlackBerry</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{44E0E4A4-B804-4813-BA2C-606537873748}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|BlackBerry'">
<PlatformToolset>qcc</PlatformToolset>
<ConfigurationAppType>Cascades</ConfigurationAppType>
<TargetArch>armle-v7</TargetArch>
<MakefileTargetName>Device-Debug</MakefileTargetName>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|BlackBerry'">
<PlatformToolset>qcc</PlatformToolset>
<ConfigurationAppType>Cascades</ConfigurationAppType>
<TargetArch>armle-v7</TargetArch>
<MakefileTargetName>Device-Release</MakefileTargetName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|BlackBerry'">
<OutDir>$(TargetArchPre)\o$(TargetArchPost)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|BlackBerry'">
<OutDir>$(TargetArchPre)\o$(TargetArchPost)-g\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|BlackBerry'">
<ClCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup>
</ItemDefinitionGroup>
<ItemGroup>
<None Include="assets\DTMFG.WAV" />
<None Include="assets\hash.png" />
<None Include="assets\main.qml" />
<None Include="AudioLoopBackSample.pro" />
<None Include="bar-descriptor.xml" />
<None Include="config.pri" />
<None Include="icon.png" />
<None Include="LICENSE" />
<None Include="Makefile" />
<None Include="README.txt" />
<None Include="translations\AudioLoopBackSample.pro" />
<None Include="translations\AudioLoopBackSample.ts" />
<None Include="translations\Makefile" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="precompiled.h" />
<ClInclude Include="src\AudioControl.hpp" />
<ClInclude Include="src\AudioLoopBackSample.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\AudioControl.cpp" />
<ClCompile Include="src\AudioLoopBackSample.cpp" />
<ClCompile Include="src\audiopcm.cpp" />
<ClCompile Include="src\main.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
81 changes: 81 additions & 0 deletions AudioLoopBackSample/AudioLoopBackSample.vcxproj.filters
@@ -0,0 +1,81 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Assets">
<UniqueIdentifier>{432f27a7-7fe7-47b9-9070-7b034028e2f3}</UniqueIdentifier>
<Extensions>qml;js;jpg;png;gif;amd</Extensions>
</Filter>
<Filter Include="Config Files">
<UniqueIdentifier>{3ebe8bf9-431a-4968-8563-d3bca035f6aa}</UniqueIdentifier>
<Extensions>pri;pro;xml</Extensions>
</Filter>
<Filter Include="Source Files">
<UniqueIdentifier>{833b8867-2a3e-4ccb-a2fe-3c0d39bc314b}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;bat;h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Translations">
<UniqueIdentifier>{67e09e08-59a8-4a14-976e-cccedd5454cb}</UniqueIdentifier>
<Extensions>ts;qm</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="AudioLoopBackSample.pro">
<Filter>Config Files</Filter>
</None>
<None Include="bar-descriptor.xml">
<Filter>Config Files</Filter>
</None>
<None Include="config.pri">
<Filter>Config Files</Filter>
</None>
<None Include="icon.png">
<Filter>Assets</Filter>
</None>
<None Include="LICENSE" />
<None Include="Makefile" />
<None Include="README.txt" />
<None Include="assets\DTMFG.WAV">
<Filter>Assets</Filter>
</None>
<None Include="assets\hash.png">
<Filter>Assets</Filter>
</None>
<None Include="assets\main.qml">
<Filter>Assets</Filter>
</None>
<None Include="translations\AudioLoopBackSample.pro">
<Filter>Translations</Filter>
</None>
<None Include="translations\AudioLoopBackSample.ts">
<Filter>Translations</Filter>
</None>
<None Include="translations\Makefile">
<Filter>Translations</Filter>
</None>
</ItemGroup>
<ItemGroup>
<ClInclude Include="precompiled.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="src\AudioControl.hpp">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="src\AudioLoopBackSample.hpp">
<Filter>Source Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\AudioControl.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\AudioLoopBackSample.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\audiopcm.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
5 changes: 3 additions & 2 deletions AudioLoopBackSample/src/audiopcm.cpp
Expand Up @@ -87,7 +87,7 @@ static int capture(circular_buffer_t* circular_buffer);
static int play(circular_buffer_t* circular_buffer);
static void capturesetup();
static void playsetup();
void toggleSpeaker(bool enable);
int toggleSpeaker(bool enable);

/**
* Encapsulation of a circular buffer
Expand Down Expand Up @@ -249,7 +249,7 @@ void stopPcmAudio() {
fprintf(stderr,"StopPCMAudio ****************: EXIT\n");
}

void toggleSpeaker(bool enable) {
int toggleSpeaker(bool enable) {
fprintf(stderr,"toggleSpeaker ****************: ENTER = %d\n", enable);
int ret;
if (enable == true) {
Expand All @@ -259,6 +259,7 @@ void toggleSpeaker(bool enable) {
}

fprintf(stderr,"toggleSpeaker ****************: EXIT\n");
return ret;
}

void toggleMute(bool enable) {
Expand Down
60 changes: 60 additions & 0 deletions AudioLoopBackSampleToFile/AudioLoopBackSampleToFile.vcxproj
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|BlackBerry">
<Configuration>Debug</Configuration>
<Platform>BlackBerry</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|BlackBerry">
<Configuration>Release</Configuration>
<Platform>BlackBerry</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{CCAFF3A5-D0C5-4B90-9BE4-E3D6740B506B}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|BlackBerry'">
<PlatformToolset>qcc</PlatformToolset>
<TargetArch>armle-v7</TargetArch>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|BlackBerry'">
<PlatformToolset>qcc</PlatformToolset>
<TargetArch>armle-v7</TargetArch>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|BlackBerry'">
<ClCompile>
<PreprocessorDefinitions>_DEBUG;_FORTIFY_SOURCE=2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>asound;audio_manager;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|BlackBerry'">
<ClCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;_FORTIFY_SOURCE=2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>asound;audio_manager;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<None Include="bar-descriptor.xml">
<SubType>Designer</SubType>
</None>
<None Include="icon.png" />
<None Include="LICENSE" />
<None Include="README.txt" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\voiceTest.c" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Assets">
<UniqueIdentifier>{e39b366a-2024-495d-b7dd-b398636e58c3}</UniqueIdentifier>
<Extensions>qml;js;jpg;png;gif;amd</Extensions>
</Filter>
<Filter Include="Config Files">
<UniqueIdentifier>{9f57763b-a7a8-4f73-874c-60960c90e99f}</UniqueIdentifier>
<Extensions>pri;pro;xml</Extensions>
</Filter>
<Filter Include="Source Files">
<UniqueIdentifier>{86a5f9f4-3865-4075-966d-e549b3012135}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;bat;h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Translations">
<UniqueIdentifier>{f1e8f47f-4b5d-490a-b75b-6b1f6460040d}</UniqueIdentifier>
<Extensions>ts;qm</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="bar-descriptor.xml">
<Filter>Config Files</Filter>
</None>
<None Include="icon.png">
<Filter>Assets</Filter>
</None>
<None Include="LICENSE" />
<None Include="README.txt" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\voiceTest.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
68 changes: 36 additions & 32 deletions AudioLoopBackSampleToFile/bar-descriptor.xml
Expand Up @@ -40,39 +40,39 @@

<!-- The category where the application appears. Either core.games or core.media. -->
<category>core.games</category>
<asset path="icon.png">icon.png</asset>
<configuration id="com.qnx.qcc.configuration.exe.debug.67501989" name="Device-Debug">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="Device-Debug/AudioLoopBackSampleToFile" entry="true" type="Qnx/Elf">AudioLoopBackSampleToFile</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.release.1929299683" name="Device-Release">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="Device-Release/AudioLoopBackSampleToFile" entry="true" type="Qnx/Elf">AudioLoopBackSampleToFile</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.profile.801459244" name="Device-Profile">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="Device-Profile/AudioLoopBackSampleToFile" entry="true" type="Qnx/Elf">AudioLoopBackSampleToFile</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.profile.coverage.2069733355" name="Device-Coverage">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="Device-Coverage/AudioLoopBackSampleToFile" entry="true" type="Qnx/Elf">AudioLoopBackSampleToFile</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.debug.1980668498" name="Simulator-Debug">
<platformArchitecture>x86</platformArchitecture>
<asset path="Simulator-Debug/AudioLoopBackSampleToFile" entry="true" type="Qnx/Elf">AudioLoopBackSampleToFile</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.profile.1257635446" name="Simulator-Profile">
<platformArchitecture>x86</platformArchitecture>
<asset path="Simulator-Profile/AudioLoopBackSampleToFile" entry="true" type="Qnx/Elf">AudioLoopBackSampleToFile</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.profile.coverage.1655487923" name="Simulator-Coverage">
<platformArchitecture>x86</platformArchitecture>
<asset path="Simulator-Coverage/AudioLoopBackSampleToFile" entry="true" type="Qnx/Elf">AudioLoopBackSampleToFile</asset>
</configuration>
<asset path="icon.png">icon.png</asset>
<configuration name="Device-Debug">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="Device-Debug/AudioLoopBackSampleToFile" entry="true" type="Qnx/Elf">AudioLoopBackSampleToFile</asset>
</configuration>
<configuration name="Device-Release">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="Device-Release/AudioLoopBackSampleToFile" entry="true" type="Qnx/Elf">AudioLoopBackSampleToFile</asset>
</configuration>
<configuration name="Device-Profile">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="Device-Profile/AudioLoopBackSampleToFile" entry="true" type="Qnx/Elf">AudioLoopBackSampleToFile</asset>
</configuration>
<configuration name="Device-Coverage">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="Device-Coverage/AudioLoopBackSampleToFile" entry="true" type="Qnx/Elf">AudioLoopBackSampleToFile</asset>
</configuration>
<configuration name="Simulator-Debug">
<platformArchitecture>x86</platformArchitecture>
<asset path="Simulator-Debug/AudioLoopBackSampleToFile" entry="true" type="Qnx/Elf">AudioLoopBackSampleToFile</asset>
</configuration>
<configuration name="Simulator-Profile">
<platformArchitecture>x86</platformArchitecture>
<asset path="Simulator-Profile/AudioLoopBackSampleToFile" entry="true" type="Qnx/Elf">AudioLoopBackSampleToFile</asset>
</configuration>
<configuration name="Simulator-Coverage">
<platformArchitecture>x86</platformArchitecture>
<asset path="Simulator-Coverage/AudioLoopBackSampleToFile" entry="true" type="Qnx/Elf">AudioLoopBackSampleToFile</asset>
</configuration>

<!-- The icon for the application, which should be 86x86. -->
<icon>
<image>icon.png</image>
<icon>
<image>icon.png</image>
</icon>

<!-- The splash screen that will appear when your application is launching. Should be 1024x600. -->
Expand All @@ -99,5 +99,9 @@

<!-- Ensure that shared libraries in the package are found at run-time. -->
<env var="LD_LIBRARY_PATH" value="app/native/lib"/>


<arg>-d</arg>
<arg>/accounts/1000/shared/downloads/InputName.wav</arg>
<arg>-o</arg>
<arg>/accounts/1000/shared/downloads/Outputname.wav</arg>
</qnx>
2 changes: 1 addition & 1 deletion AudioLoopBackSampleToFile/src/voiceTest.c
Expand Up @@ -652,7 +652,7 @@ int main(int argc, char *argv[])
}
else
{
cli_print("No input file specified. Please provide an input WAV file with the -i option.");
cli_print("No input file specified. Please provide an input WAV file with the -d option.");
return -1;
}
cli_print("rate: %d channels: %d", samplerate, channels);
Expand Down

0 comments on commit bd65789

Please sign in to comment.