Skip to content

Commit 655ecbb

Browse files
spotlesscoderspotlesscoder
committed
fix paths, post build commands, implementation, async fetching fixed again
1 parent d80c07d commit 655ecbb

File tree

9 files changed

+24
-38
lines changed

9 files changed

+24
-38
lines changed

‎ReaperDAWHub.ControllerTest/ReaperDAWHub.ControllerTest.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
9393
</ClCompile>
9494
<PostBuildEvent>
95-
<Command>cd $(TargetDir) &amp;&amp; $(TargetName).exe</Command>
95+
<Command>"$(TargetPath)"</Command>
9696
</PostBuildEvent>
9797
<Link>
9898
<AdditionalDependencies>ReaperDAWHub.Controller.lib;%(AdditionalDependencies)</AdditionalDependencies>

‎ReaperDAWHub.GUI.Demo/includes/MainComponent.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef MAINCOMPONENT_H_INCLUDED
1010
#define MAINCOMPONENT_H_INCLUDED
1111

12-
#include "../../../JuceLibraryCode/JuceHeader.h"
12+
#include "../../JuceLibraryCode/JuceHeader.h"
1313

1414

1515
//==============================================================================

‎ReaperDAWHub.GUI/Source/ProjectBrowserTabComponent.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
ProjectBrowserTabComponent::ProjectBrowserTabComponent() : TabbedComponent(TabbedButtonBar::TabsAtTop) {
66
ProjectEntryListComponent *pelc = new ProjectEntryListComponent();
77
LocalProjectEntryComponent *lpec = new LocalProjectEntryComponent();
8-
<<<<<<< HEAD
9-
pelc->addListEntry(*lpec);
10-
=======
118
pelc->addListEntry(lpec);
12-
>>>>>>> parent of 0d78d6d... apply mvc pattern
139
addTab("Remote projects", Colours::lightgrey, new ProjectEntryListComponent(), true);
1410
addTab("Local projects", Colours::lightgrey, pelc, true);
1511
addTab("Shared projects", Colours::lightgrey, new ProjectEntryListComponent(), true);

‎ReaperDAWHub.GUI/Source/ProjectEntryListComponent.cpp

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
<<<<<<< HEAD
2-
#include "../includes/ProjectEntryListComponent.h"
3-
#include "../includes/LocalProjectEntryComponent.h"
4-
5-
ProjectEntryListComponent::ProjectEntryListComponent() {
6-
setSize(500, 600);
7-
addListEntry((*(new ProjectEntryComponent())));
8-
=======
91
#define BOOST_THREAD_PROVIDES_FUTURE
102
#include "../includes/ProjectEntryListComponent.h"
113
#include "../includes/LocalProjectEntryComponent.h"
@@ -23,31 +15,30 @@ ProjectEntryListComponent::ProjectEntryListComponent() {
2315
setSize(500, 600);
2416
addListEntry((new ProjectEntryComponent()));
2517
initData();
26-
>>>>>>> parent of 0d78d6d... apply mvc pattern
2718
}
2819

2920
ProjectEntryListComponent::~ProjectEntryListComponent() {
3021

3122
}
3223

33-
void ProjectEntryListComponent::addListEntry(ProjectEntryComponent &pec) {
24+
void ProjectEntryListComponent::addListEntry(ProjectEntryComponent *pec) {
3425
addListEntryComponent(pec);
3526
}
3627

37-
void ProjectEntryListComponent::addListEntry(LocalProjectEntryComponent &pec) {
28+
void ProjectEntryListComponent::addListEntry(LocalProjectEntryComponent *pec) {
3829
addListEntryComponent(pec);
3930
}
4031

41-
void ProjectEntryListComponent::addListEntryComponent(Component &pec) {
42-
listEntries.push_back(&pec);
32+
void ProjectEntryListComponent::addListEntryComponent(Component *pec) {
33+
listEntries.push_back(pec);
34+
pec->setBounds(0, 60 * (listEntries.size() - 1), getLocalBounds().getWidth(), 60);
35+
setSize(200, 150);
4336
addAndMakeVisible(pec);
44-
pec.setBounds(0, 60 * listEntries.size() - 1, getLocalBounds().getWidth(), 60);
37+
repaint();
4538
}
4639

4740
void ProjectEntryListComponent::resized() {
4841

49-
<<<<<<< HEAD
50-
=======
5142
}
5243

5344
void ProjectEntryListComponent::requestProjects()
@@ -73,9 +64,9 @@ void ProjectEntryListComponent::fetchData(const boost::system::error_code& /*e*/
7364
boost::asio::deadline_timer* tmr) {
7465
if (isReady(projectsFuture)) {
7566
projects = projectsFuture.get();
76-
for(auto project : projects)
67+
for (auto project : projects)
7768
{
78-
ProjectEntryComponent *pec = new ProjectEntryComponent(std::to_string(project.getId()), "222");
69+
ProjectEntryComponent *pec = new ProjectEntryComponent(std::to_string(project.getId()), "222");
7970
addListEntry(pec);
8071
}
8172
Logger::writeToLog("got projs");
@@ -84,5 +75,4 @@ void ProjectEntryListComponent::fetchData(const boost::system::error_code& /*e*/
8475
tmr->expires_at(tmr->expires_at() + boost::posix_time::seconds(interval_secs));
8576
tmr->async_wait(boost::bind(&ProjectEntryListComponent::fetchData, this, boost::asio::placeholders::error, tmr));
8677
}
87-
>>>>>>> parent of 0d78d6d... apply mvc pattern
8878
}

‎ReaperDAWHub.GUI/includes/ProjectEntryListComponent.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,8 @@ class ProjectEntryListComponent : public Component
1515
ProjectEntryListComponent();
1616
~ProjectEntryListComponent();
1717
void resized() override;
18-
<<<<<<< HEAD
19-
void addListEntry(ProjectEntryComponent &pec);
20-
void addListEntry(LocalProjectEntryComponent &pec);
21-
=======
2218
void addListEntry(ProjectEntryComponent *pec);
2319
void addListEntry(LocalProjectEntryComponent *pec);
24-
>>>>>>> parent of 0d78d6d... apply mvc pattern
2520

2621
private:
2722
void initData();
@@ -30,10 +25,6 @@ class ProjectEntryListComponent : public Component
3025
void fetchData(const boost::system::error_code& /*e*/,
3126
boost::asio::deadline_timer* t);
3227
std::vector<Component *> listEntries = std::vector<Component *>();
33-
<<<<<<< HEAD
34-
void addListEntryComponent(Component &pec);
35-
};
36-
=======
3728
void addListEntryComponent(Component *pec);
3829

3930
std::vector<Project> projects;
@@ -44,4 +35,3 @@ class ProjectEntryListComponent : public Component
4435
boost::asio::io_service io_service;
4536
boost::asio::deadline_timer* timer;
4637
};
47-
>>>>>>> parent of 0d78d6d... apply mvc pattern

‎ReaperDAWHub.Playground/ReaperDAWHub.Playground.vcxproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,13 @@
9393
<Optimization>Disabled</Optimization>
9494
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9595
<SDLCheck>true</SDLCheck>
96+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9697
</ClCompile>
9798
<Link>
9899
<SubSystem>Console</SubSystem>
99100
<GenerateDebugInformation>true</GenerateDebugInformation>
101+
<AdditionalDependencies>ReaperDAWHub.Controller.lib;%(AdditionalDependencies)</AdditionalDependencies>
102+
<AdditionalLibraryDirectories>C:\Program Files %28x86%29\REAPER\Plugins;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
100103
</Link>
101104
</ItemDefinitionGroup>
102105
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -164,6 +167,11 @@
164167
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
165168
</ClCompile>
166169
</ItemGroup>
170+
<ItemGroup>
171+
<ProjectReference Include="..\ReaperDAWHub.Controller\ReaperDAWHub.Controller.vcxproj">
172+
<Project>{01056804-dcde-4092-9b76-346dd75c98e0}</Project>
173+
</ProjectReference>
174+
</ItemGroup>
167175
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
168176
<ImportGroup Label="ExtensionTargets">
169177
</ImportGroup>

‎ReaperDAWHub.Service.Client.RESTImpl.Test/ReaperDAWHub.Service.Client..RESTImplTest.vcxproj.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<AdditionalLibraryDirectories>C:\Program Files %28x86%29\REAPER\Plugins;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
9999
</Link>
100100
<PostBuildEvent>
101-
<Command>cd $(TargetDir) &amp;&amp; $(TargetName).exe</Command>
101+
<Command>"$(TargetPath)"</Command>
102102
</PostBuildEvent>
103103
</ItemDefinitionGroup>
104104
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

‎ReaperDAWHub.Service.Client.Serialization.JSONImplTest/ReaperDAWHub.Service.Client.Serialization.JSONImplTest.vcxproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@
8484
</ImportGroup>
8585
<PropertyGroup Label="UserMacros" />
8686
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
87-
<OutDir>C:\Program Files (x86)\Reaper\Plugins\</OutDir>
87+
<OutDir>C:\Program Files (x86)\REAPER\Plugins\</OutDir>
88+
<PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
8889
</PropertyGroup>
8990
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
9091
<OutDir>C:\Program Files\REAPER (x64)\Plugins\</OutDir>
@@ -114,7 +115,7 @@
114115
<AssemblyDebug>true</AssemblyDebug>
115116
</Link>
116117
<PostBuildEvent>
117-
<Command>cd $(TargetDir) &amp;&amp; $(TargetName).exe</Command>
118+
<Command>"$(TargetPath)"</Command>
118119
</PostBuildEvent>
119120
</ItemDefinitionGroup>
120121
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

‎install.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
conan install -s arch=x86 -s build_type=Debug -s compiler="Visual Studio" -s compiler.version=14 -s compiler.runtime=MD

0 commit comments

Comments
 (0)